---

yaml --- r: 194682 b: refs/heads/master c: f7917af h: refs/heads/master v: v3
git-mirror · Apr 27, 2010 · 41e4bb0 · 41e4bb0
1 parent fe43abd
commit 41e4bb0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f824719a2729f1a6bb78de20c4d3b3dbdd81a09
+refs/heads/master: f7917af92024d43bc20bc1afc92de27b0bd0f50b
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
@@ -96,17 +96,16 @@ static int ieee80211_change_iface(struct wiphy *wiphy,
 					    params->mesh_id_len,
 					    params->mesh_id);
 
-	if (sdata->vif.type != NL80211_IFTYPE_MONITOR || !flags)
-		return 0;
-
 	if (type == NL80211_IFTYPE_AP_VLAN &&
 	    params && params->use_4addr == 0)
 		rcu_assign_pointer(sdata->u.vlan.sta, NULL);
 	else if (type == NL80211_IFTYPE_STATION &&
 		 params && params->use_4addr >= 0)
 		sdata->u.mgd.use_4addr = params->use_4addr;
 
-	sdata->u.mntr_flags = *flags;
+	if (sdata->vif.type == NL80211_IFTYPE_MONITOR && flags)
+		sdata->u.mntr_flags = *flags;
+
 	return 0;
 }