From: Johannes Berg <johannes@sipsolutions.net>
Date: Fri, 27 Jul 2007 13:43:24 +0000 (+0200)
Subject: [MAC80211]: fix add_interface monitor mode behaviour
X-Git-Tag: v2.6.24-rc1~1454^2~845
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1bec3f1a3ec5d922d1040c7845b82cd496c02d90;p=linux-2.6-omap-h63xx.git

[MAC80211]: fix add_interface monitor mode behaviour

This makes it behave the same whether we have monitor during operation
or not.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Jiri Benc <jbenc@suse.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 4715a952591..5fc240259f5 100644
--- a/net/mac80211/ieee80211.c
+++ b/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)