aboutsummaryrefslogtreecommitdiff
path: root/net/lapb/lapb_timer.c
diff options
context:
space:
mode:
authorMichael Braun <michael-dev@fami-braun.de>2014-03-06 15:08:43 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-13 13:59:43 +0200
commitea6dbcd027542fb255fa6cd34f88f8dfb697646b (patch)
tree5daa1ff98cf90f3a2a0602e055d1bd1844236325 /net/lapb/lapb_timer.c
parent6e6d61f30ed8bac11313cbb0f8f0031f1bd5a268 (diff)
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions