mac80211: Be more careful when changing channels.

Commit Message

Ben Greear Jan. 28, 2011, 6:09 a.m. UTC

None

Patch

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 9bf2193..3e5a75b 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1223,10 +1223,16 @@  static int ieee80211_set_channel(struct wiphy *wiphy,
 {
 	struct ieee80211_local *local = wiphy_priv(wiphy);
 	struct ieee80211_sub_if_data *sdata = NULL;
+	struct ieee80211_channel *old_oper;
+	enum nl80211_channel_type old_oper_type;
+	enum nl80211_channel_type old_vif_oper_type = NL80211_CHAN_NO_HT;
 
 	if (netdev)
 		sdata = IEEE80211_DEV_TO_SUB_IF(netdev);
 
+	if (sdata)
+		old_vif_oper_type == sdata->vif.bss_conf.channel_type;
+
 	switch (ieee80211_get_channel_mode(local, NULL)) {
 	case CHAN_MODE_HOPPING:
 		return -EBUSY;
@@ -1240,13 +1246,21 @@  static int ieee80211_set_channel(struct wiphy *wiphy,
 		break;
 	}
 
+	old_oper = local->oper_channel;
 	local->oper_channel = chan;
 
-	if (!ieee80211_set_channel_type(local, sdata, channel_type))
+	old_oper_type = local->_oper_channel_type;
+	if (!ieee80211_set_channel_type(local, sdata, channel_type)) {
+		local->oper_channel = old_oper;
 		return -EBUSY;
+	}
+
+	if ((old_oper != local->oper_channel) ||
+	    (old_oper_type != local->_oper_channel_type))
+		ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
 
-	ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
-	if (sdata && sdata->vif.type != NL80211_IFTYPE_MONITOR)
+	if ((sdata && sdata->vif.type != NL80211_IFTYPE_MONITOR) &&
+	    old_vif_oper_type != sdata->vif.bss_conf.channel_type)
 		ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_HT);
 
 	return 0;