Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 112c44b2 authored by Michael Braun's avatar Michael Braun Committed by Johannes Berg
Browse files

mac80211: fix WPA with VLAN on AP side with ps-sta again 



commit de74a1d9
  "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 "7cbf9d01"
  "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: 7cbf9d01 ("mac80211: fix oops on mesh PS broadcast forwarding")
Signed-off-by: default avatarMichael Braun <michael-dev@fami-braun.de>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent aa475b0e

net/mac80211/tx.c

+1 −1
Original line number Diff line number Diff line
@@ -2885,7 +2885,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;