From 41e4bb0d7ab5ece6d1c91dee3936a49d866c61af Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 27 Apr 2010 00:26:34 +0200
Subject: [PATCH] --- yaml --- r: 194682 b: refs/heads/master c:
 f7917af92024d43bc20bc1afc92de27b0bd0f50b h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/mac80211/cfg.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 13e9d028e741..b9bab7b073bb 100644
--- 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
index f97dda735cbb..592f07d2ae5c 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -96,9 +96,6 @@ 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);
@@ -106,7 +103,9 @@ static int ieee80211_change_iface(struct wiphy *wiphy,
 		 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;
 }