From bf17bf6fd0292032960fe0774059fe39e0b32587 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Fri, 27 Jul 2007 15:43:24 +0200
Subject: [PATCH] --- yaml --- r: 66238 b: refs/heads/master c:
 1bec3f1a3ec5d922d1040c7845b82cd496c02d90 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 901d56bbd151..34571dea2fa9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b8a74e3482f9fc077a88c13fa0ceca8feb0b772
+refs/heads/master: 1bec3f1a3ec5d922d1040c7845b82cd496c02d90
diff --git a/trunk/net/mac80211/ieee80211.c b/trunk/net/mac80211/ieee80211.c
index 4715a9525918..5fc240259f55 100644
--- a/trunk/net/mac80211/ieee80211.c
+++ b/trunk/net/mac80211/ieee80211.c
@@ -425,7 +425,10 @@ static int ieee80211_open(struct net_device *dev)
 
 	conf.if_id = dev->ifindex;
 	conf.type = sdata->type;
-	conf.mac_addr = dev->dev_addr;
+	if (sdata->type == IEEE80211_IF_TYPE_MNTR)
+		conf.mac_addr = NULL;
+	else
+		conf.mac_addr = dev->dev_addr;
 	res = local->ops->add_interface(local_to_hw(local), &conf);
 	if (res) {
 		if (sdata->type == IEEE80211_IF_TYPE_MNTR)