diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-09-10 23:27:40 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-09-15 16:48:24 -0400 |
commit | 3061307013267c2c75efae3925f461858d832101 (patch) | |
tree | 613e4b49df18d7d26137367623f19fef5f38388e /net | |
parent | ff550cb4f8ef03f7cb0b4948e503388bcfb96034 (diff) |
mac80211: pass AP vif pointer for VLANs
We cannot pass a VLAN vif pointer to the driver since those are
entirely virtual and we never tell the driver.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/tx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 7468495d6f9c..698c8233e6b3 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -1351,6 +1351,10 @@ int ieee80211_master_start_xmit(struct sk_buff *skb, | |||
1351 | return 0; | 1351 | return 0; |
1352 | } | 1352 | } |
1353 | 1353 | ||
1354 | if (osdata->vif.type == NL80211_IFTYPE_AP_VLAN) | ||
1355 | osdata = container_of(osdata->bss, | ||
1356 | struct ieee80211_sub_if_data, | ||
1357 | u.ap); | ||
1354 | info->control.vif = &osdata->vif; | 1358 | info->control.vif = &osdata->vif; |
1355 | ret = ieee80211_tx(odev, skb); | 1359 | ret = ieee80211_tx(odev, skb); |
1356 | dev_put(odev); | 1360 | dev_put(odev); |