[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>

1 files changed, 4 insertions, 1 deletions

diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 4715a9525918..5fc240259f55 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)