diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index be5f723d643acbb4146edd3bc7fbbcdd7f943b6d..8a9650343f264c3c8c0d030350c8ae5b9b29379c 100644
--- a/net/mac80211/mlme.c
+++ b/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) {