diff --git a/[refs] b/[refs]
index dafb2366cb72..984211178fd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e979e33c3972044e1be5e46552a02c3b9c0bc7a7
+refs/heads/master: ac4d82fa01c194dba10b9a7c35449ba36eb642fc
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index 9a974579ba89..cd8b1fb05d42 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -689,7 +689,8 @@ static int ieee80211_set_channel(struct wiphy *wiphy,
 	case CHAN_MODE_HOPPING:
 		return -EBUSY;
 	case CHAN_MODE_FIXED:
-		if (local->oper_channel != chan)
+		if (local->oper_channel != chan ||
+		    (!sdata && local->_oper_channel_type != channel_type))
 			return -EBUSY;
 		if (!sdata && local->_oper_channel_type == channel_type)
 			return 0;