---

yaml --- r: 311375 b: refs/heads/master c: f8cdddb h: refs/heads/master i: 311373: 524b910 311371: a9e5b41 311367: 2db7c6a 311359: f286e50 v: v3
git-mirror · Jun 9, 2012 · a2caaf2 · a2caaf2
1 parent 6e13c5e
commit a2caaf2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d13e14148154e5ce58467e76321eef1dd912c416
+refs/heads/master: f8cdddb8d61d16a156229f0910f7ecfc7a82c003
diff --git a/trunk/net/wireless/util.c b/trunk/net/wireless/util.c
@@ -804,7 +804,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
 	     ntype == NL80211_IFTYPE_P2P_CLIENT))
 		return -EBUSY;
 
-	if (ntype != otype) {
+	if (ntype != otype && netif_running(dev)) {
 		err = cfg80211_can_change_interface(rdev, dev->ieee80211_ptr,
 						    ntype);
 		if (err)