diff options
| author | Michael Braun <michael-dev@fami-braun.de> | 2014-03-06 15:08:43 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-05-15 09:56:03 +0200 |
| commit | 4fa516c800c27a7b3a26817e033eff674a016f54 (patch) | |
| tree | b9241bdae75dd57877faad9677cf7fad6af598be | |
| parent | 243677b1125ce3f460e45d887127072c6d323579 (diff) | |
| download | lwn-4fa516c800c27a7b3a26817e033eff674a016f54.tar.gz lwn-4fa516c800c27a7b3a26817e033eff674a016f54.zip | |
mac80211: fix WPA with VLAN on AP side with ps-sta again
commit 112c44b2df0984121a52fbda89425843b8e1a457 upstream.
commit de74a1d9032f4d37ea453ad2a647e1aff4cd2591
"mac80211: fix WPA with VLAN on AP side with ps-sta"
fixed an issue where queued multicast packets would
be sent out encrypted with the key of an other bss.
commit "7cbf9d017dbb5e3276de7d527925d42d4c11e732"
"mac80211: fix oops on mesh PS broadcast forwarding"
essentially reverted it, because vif.type cannot be AP_VLAN
due to the check to vif.type in ieee80211_get_buffered_bc before.
As the later commit intended to fix the MESH case, fix it
by checking for IFTYPE_AP instead of IFTYPE_AP_VLAN.
Fixes: 7cbf9d017dbb ("mac80211: fix oops on mesh PS broadcast forwarding")
Signed-off-by: Michael Braun <michael-dev@fami-braun.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | net/mac80211/tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index d6a47e76efff..267bc8e4b8b6 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2806,7 +2806,7 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw, cpu_to_le16(IEEE80211_FCTL_MOREDATA); } - if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) + if (sdata->vif.type == NL80211_IFTYPE_AP) sdata = IEEE80211_DEV_TO_SUB_IF(skb->dev); if (!ieee80211_tx_prepare(sdata, &tx, skb)) break; |