projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ff550cb
)
mac80211: pass AP vif pointer for VLANs
author
Johannes Berg
<johannes@sipsolutions.net>
Thu, 11 Sep 2008 03:27:40 +0000
(
05:27
+0200)
committer
John W. Linville
<linville@tuxdriver.com>
Mon, 15 Sep 2008 20:48:24 +0000
(16:48 -0400)
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>
net/mac80211/tx.c
patch
|
blob
|
history
diff --git
a/net/mac80211/tx.c
b/net/mac80211/tx.c
index
7468495
..
698c823
100644
(file)
--- a/
net/mac80211/tx.c
+++ b/
net/mac80211/tx.c
@@
-1351,6
+1351,10
@@
int ieee80211_master_start_xmit(struct sk_buff *skb,
return 0;
}
+ if (osdata->vif.type == NL80211_IFTYPE_AP_VLAN)
+ osdata = container_of(osdata->bss,
+ struct ieee80211_sub_if_data,
+ u.ap);
info->control.vif = &osdata->vif;
ret = ieee80211_tx(odev, skb);
dev_put(odev);