---

yaml --- r: 66238 b: refs/heads/master c: 1bec3f1 h: refs/heads/master v: v3
git-mirror · Oct 10, 2007 · bf17bf6 · bf17bf6
1 parent 443407d
commit bf17bf6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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)