---

yaml --- r: 111715 b: refs/heads/master c: 3061307 h: refs/heads/master i: 111713: f9caa63 111711: e9da6d7 v: v3
git-mirror · Sep 15, 2008 · a3c346b · a3c346b
1 parent b248468
commit a3c346b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff550cb4f8ef03f7cb0b4948e503388bcfb96034
+refs/heads/master: 3061307013267c2c75efae3925f461858d832101
diff --git a/trunk/net/mac80211/tx.c b/trunk/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);