diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-06 10:21:17 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-06 10:21:17 -0500 |
| commit | 32cdd592b723fc88ecca699e550197cd48bb4ad6 (patch) | |
| tree | f6e45b4630abb47fa352b53fdc546aec27eb5cda /net/mac80211/tx.c | |
| parent | 66d29cbc59433ba538922a9e958495156b31b83b (diff) | |
| parent | 4f21e7e4414c91cc9a3e37b93574aa98db66894d (diff) | |
| download | blackbird-op-linux-32cdd592b723fc88ecca699e550197cd48bb4ad6.tar.gz blackbird-op-linux-32cdd592b723fc88ecca699e550197cd48bb4ad6.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index ce78d1149f1d..8914d2d2881a 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2745,7 +2745,8 @@ ieee80211_get_buffered_bc(struct ieee80211_hw *hw, cpu_to_le16(IEEE80211_FCTL_MOREDATA); } - sdata = IEEE80211_DEV_TO_SUB_IF(skb->dev); + if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) + sdata = IEEE80211_DEV_TO_SUB_IF(skb->dev); if (!ieee80211_tx_prepare(sdata, &tx, skb)) break; dev_kfree_skb_any(skb); |
