mac80211: fix WPA with VLAN on AP side with ps-sta again
authorMichael Braun <michael-dev@fami-braun.de>
Thu, 6 Mar 2014 14:08:43 +0000 (15:08 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 19 Mar 2014 20:29:54 +0000 (21:29 +0100)
commit112c44b2df0984121a52fbda89425843b8e1a457
tree312907a32589b0e111eb02bc5e4b12ceab58e25a
parentaa475b0ef34a8230b8cc3a298bf67c668540d689
mac80211: fix WPA with VLAN on AP side with ps-sta again

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.

Cc: stable@vger.kernel.org
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>
net/mac80211/tx.c