From a89566168922622efe1982607b198d75b6c98208 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Thu, 4 Oct 2007 14:04:40 -0400
Subject: [PATCH] --- yaml --- r: 66993 b: refs/heads/master c:
 0654ff055c6ce5642eed88ba22915b0e56666794 h: refs/heads/master i:   66991:
 68539c56420d87dbb8b74de57581bb1e219c1f67 v: v3

---
 [refs]                               | 2 +-
 trunk/net/mac80211/ieee80211_iface.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 93fb0db5cdc0..3fb671fb08c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04799fae8ecb42b2c687fa85fe32ff79ea0e9dc9
+refs/heads/master: 0654ff055c6ce5642eed88ba22915b0e56666794
diff --git a/trunk/net/mac80211/ieee80211_iface.c b/trunk/net/mac80211/ieee80211_iface.c
index be7e77f66fee..43e505d29452 100644
--- a/trunk/net/mac80211/ieee80211_iface.c
+++ b/trunk/net/mac80211/ieee80211_iface.c
@@ -106,7 +106,7 @@ void ieee80211_if_set_type(struct net_device *dev, int type)
 	 * which already has a hard_start_xmit routine assigned
 	 * which must not be changed.
 	 */
-	if (!dev->hard_start_xmit)
+	if (dev != sdata->local->mdev)
 		dev->hard_start_xmit = ieee80211_subif_start_xmit;
 
 	/*