Commit de74a1d9 authored Feb 13, 2013 by Michael Braun Committed by Johannes Berg Feb 15, 2013

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

When sending a broadcast while at least on of the connected stations is
sleeping, it gets queued and send after a DTIM beacon is sent.
If the packet was to be sent on a vlan interface, the vif used for dequeing
from the per-bss queue does not hold the per-vlan sdata. The correct sdata is
required to use the correct per-vlan broadcast/multicast key.

This patch fixes this by restoring the per-vlan sdata using the skb->dev entry.

Signed-off-by: Michael Braun <michael-dev@fami-braun.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 397a7a24

net/mac80211/tx.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2785,6 +2785,7 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw,
		cpu_to_le16(IEEE80211_FCTL_MOREDATA);
		}

		sdata = IEEE80211_DEV_TO_SUB_IF(skb->dev);
		if (!ieee80211_tx_prepare(sdata, &tx, skb))
		break;
		dev_kfree_skb_any(skb);

Admin message