From a3c346b01e447423d28e59e4a6e5fcfb660fda77 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 11 Sep 2008 05:27:40 +0200
Subject: [PATCH] --- yaml --- r: 111715 b: refs/heads/master c:
 3061307013267c2c75efae3925f461858d832101 h: refs/heads/master i:   111713:
 f9caa632cb53ef822c102a29c3f6b33af45406b1   111711:
 e9da6d738fcb4d44c3658a1b07882b031585a069 v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/tx.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e5bced6ccdd8..4469bc4f5796 100644
--- 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
index 7468495d6f9c..698c8233e6b3 100644
--- 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);