diff options
| author | Michael Braun <michael-dev@fami-braun.de> | 2013-02-13 16:49:16 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-15 09:41:08 +0100 |
| commit | de74a1d9032f4d37ea453ad2a647e1aff4cd2591 (patch) | |
| tree | 515e2fcbb325d2c2fe0ae1ab53572517cb04f6d1 | |
| parent | 397a7a24ef8c2967a3e8090013f9c54714110c48 (diff) | |
| download | linux-3.10-de74a1d9032f4d37ea453ad2a647e1aff4cd2591.tar.gz linux-3.10-de74a1d9032f4d37ea453ad2a647e1aff4cd2591.tar.bz2 linux-3.10-de74a1d9032f4d37ea453ad2a647e1aff4cd2591.zip | |
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>
| -rw-r--r-- | net/mac80211/tx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index f476aa6a771..71385bfc15d 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); |