From e255fa9793644a6461107528d2775fe60a453965 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 16 Sep 2008 20:22:21 +0200
Subject: [PATCH] --- yaml --- r: 111941 b: refs/heads/master c:
 f8b25cdad719cddceb9cf0d350065b3e59e74219 h: refs/heads/master i:   111939:
 83c327b1dfd33f38be925f7ae2e1e61dfe3b7f6a v: v3

---
 [refs]                   | 2 +-
 trunk/net/mac80211/cfg.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c5df7fea1f3f..ba348c650187 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 723b038def23ce0606754c4f598cbb96bae9a102
+refs/heads/master: f8b25cdad719cddceb9cf0d350065b3e59e74219
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index a8501f14b167..89a183c2327a 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -100,6 +100,9 @@ static int ieee80211_change_iface(struct wiphy *wiphy, int ifindex,
 	if (ret)
 		return ret;
 
+	if (netif_running(sdata->dev))
+		return -EBUSY;
+
 	if (ieee80211_vif_is_mesh(&sdata->vif) && params->mesh_id_len)
 		ieee80211_sdata_set_mesh_id(sdata,
 					    params->mesh_id_len,