diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-03 19:15:57 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-03 19:15:57 +0200 |
| commit | a7c1a644e16400a33e122f2b03c6a34240001b49 (patch) | |
| tree | 21c2dbede682ed656d1660d7fee657d3aea2c4f1 /net/mac80211/tx.c | |
| parent | ASoC: samsung: remove last traces of neo1973-gta01 (diff) | |
| parent | ASoC: Samsung: set drvdata before adding secondary device (diff) | |
| download | linux-a7c1a644e16400a33e122f2b03c6a34240001b49.tar.xz linux-a7c1a644e16400a33e122f2b03c6a34240001b49.zip | |
Merge branch 'fix/samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-samsung
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); |