aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/ieee80211.c5
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)
425 425
426 conf.if_id = dev->ifindex; 426 conf.if_id = dev->ifindex;
427 conf.type = sdata->type; 427 conf.type = sdata->type;
428 conf.mac_addr = dev->dev_addr; 428 if (sdata->type == IEEE80211_IF_TYPE_MNTR)
429 conf.mac_addr = NULL;
430 else
431 conf.mac_addr = dev->dev_addr;
429 res = local->ops->add_interface(local_to_hw(local), &conf); 432 res = local->ops->add_interface(local_to_hw(local), &conf);
430 if (res) { 433 if (res) {
431 if (sdata->type == IEEE80211_IF_TYPE_MNTR) 434 if (sdata->type == IEEE80211_IF_TYPE_MNTR)