diff --git a/[refs] b/[refs]
index a42aa9494f1a..a92ab8fb5daa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4bb5c3fd9333024044362df67e23e96158489ed
+refs/heads/master: fe6f212ce12341df18ef9b890bea739b4547157b
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index be5f723d643a..8a9650343f26 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -167,6 +167,8 @@ static u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata,
 	ht_changed = conf_is_ht(&local->hw.conf) != enable_ht ||
 		     channel_type != local->hw.conf.channel_type;
 
+	if (local->tmp_channel)
+		local->tmp_channel_type = channel_type;
 	local->oper_channel_type = channel_type;
 
 	if (ht_changed) {