diff --git a/[refs] b/[refs]
index da1b755de7e1..76f52ef20d77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fb7404e0eaf574c00d01d2b1ce2615229b350cd
+refs/heads/master: dcebf45cdc8384be9009b2b9a825054b64742768
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
index 5abbc3f07dd6..b9074824862a 100644
--- a/trunk/net/mac80211/iface.c
+++ b/trunk/net/mac80211/iface.c
@@ -699,7 +699,8 @@ int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata,
 		return 0;
 
 	/* Setting ad-hoc mode on non-IBSS channel is not supported. */
-	if (sdata->local->oper_channel->flags & IEEE80211_CHAN_NO_IBSS)
+	if (sdata->local->oper_channel->flags & IEEE80211_CHAN_NO_IBSS &&
+	    type == NL80211_IFTYPE_ADHOC)
 		return -EOPNOTSUPP;
 
 	/*