diff mbox

mac80211: check interface is down before type change

Message ID 1257099940.3555.159.camel@johannes.local (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Johannes Berg Nov. 1, 2009, 6:25 p.m. UTC 
None
diff mbox

Patch

--- wireless-testing.orig/net/mac80211/cfg.c	2009-11-01 19:19:16.000000000 +0100
+++ wireless-testing/net/mac80211/cfg.c	2009-11-01 19:20:49.000000000 +0100
@@ -72,6 +72,9 @@  static int ieee80211_change_iface(struct
 	struct ieee80211_sub_if_data *sdata;
 	int ret;
 
+	if (netif_running(dev))
+		return -EBUSY;
+
 	if (!nl80211_type_check(type))
 		return -EINVAL;
 
@@ -81,9 +84,6 @@  static int ieee80211_change_iface(struct
 	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,