diff options
| author | Felix Fietkau <nbd@nbd.name> | 2018-02-23 13:55:50 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-02-27 11:05:52 +0100 |
| commit | 9251a4736ee360d3850644ddaaa1a61dcec96238 (patch) | |
| tree | 3535f844d054d9380a97361367de9ca09257e707 /net/mac80211/rx.c | |
| parent | mac80211: support fast-rx with incompatible PS capabilities when PS is disabled (diff) | |
| download | linux-9251a4736ee360d3850644ddaaa1a61dcec96238.tar.xz linux-9251a4736ee360d3850644ddaaa1a61dcec96238.zip | |
mac80211: support station 4-addr mode fast-rx
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 1d417960d376..2783c5cd7de7 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -3747,10 +3747,6 @@ void ieee80211_check_fast_rx(struct sta_info *sta) switch (sdata->vif.type) { case NL80211_IFTYPE_STATION: - /* 4-addr is harder to deal with, later maybe */ - if (sdata->u.mgd.use_4addr) - goto clear; - if (sta->sta.tdls) { fastrx.da_offs = offsetof(struct ieee80211_hdr, addr1); fastrx.sa_offs = offsetof(struct ieee80211_hdr, addr2); @@ -3763,6 +3759,13 @@ void ieee80211_check_fast_rx(struct sta_info *sta) cpu_to_le16(IEEE80211_FCTL_FROMDS); } + if (sdata->u.mgd.use_4addr && !sta->sta.tdls) { + fastrx.expected_ds_bits |= + cpu_to_le16(IEEE80211_FCTL_TODS); + fastrx.da_offs = offsetof(struct ieee80211_hdr, addr3); + fastrx.sa_offs = offsetof(struct ieee80211_hdr, addr4); + } + if (!sdata->u.mgd.powersave) break; |