From: Michael Braun Date: Wed, 13 Feb 2013 15:49:16 +0000 (+0100) Subject: mac80211: fix WPA with VLAN on AP side with ps-sta X-Git-Tag: submit/tizen_common/20140905.094502~3339^2~28^2^2~26^2~45 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de74a1d9032f4d37ea453ad2a647e1aff4cd2591;p=sdk%2Femulator%2Femulator-kernel.git 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 Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index f476aa6..71385bf 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -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);