Jelajahi Sumber

[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>
Johannes Berg 18 tahun lalu
induk
melakukan
1bec3f1a3e
1 mengubah file dengan 4 tambahan dan 1 penghapusan
  1. 4 1
      net/mac80211/ieee80211.c

+ 4 - 1
net/mac80211/ieee80211.c

@@ -425,7 +425,10 @@ static int ieee80211_open(struct net_device *dev)
 
 
 	conf.if_id = dev->ifindex;
 	conf.if_id = dev->ifindex;
 	conf.type = sdata->type;
 	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);
 	res = local->ops->add_interface(local_to_hw(local), &conf);
 	if (res) {
 	if (res) {
 		if (sdata->type == IEEE80211_IF_TYPE_MNTR)
 		if (sdata->type == IEEE80211_IF_TYPE_MNTR)