Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a2ac260 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: clean up ieee80211_set_channel 



There's no need for ieee80211_set_channel to check
whether a change in configuration happened since
ieee80211_hw_config() auto-detects it.

Additionally, it's wrong to pretend the HT config
for the BSS changed, it didn't, the BSS can't be
up & running (AP beaconing etc.) when the channel
type is changed anyway.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9dde6423

net/mac80211/cfg.c

+2 −16
Original line number Original line Diff line number Diff line
@@ -1684,9 +1684,6 @@ static int ieee80211_set_channel(struct wiphy *wiphy, 
{

{

	struct ieee80211_local *local = wiphy_priv(wiphy);

	struct ieee80211_local *local = wiphy_priv(wiphy);

	struct ieee80211_sub_if_data *sdata = NULL;

	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)

	if (netdev)

		sdata = IEEE80211_DEV_TO_SUB_IF(netdev);

		sdata = IEEE80211_DEV_TO_SUB_IF(netdev);
@@ -1704,24 +1701,13 @@ static int ieee80211_set_channel(struct wiphy *wiphy, 
		break;

		break;

	}

	}





	if (sdata)

		old_vif_oper_type = sdata->vif.bss_conf.channel_type;

	old_oper_type = local->_oper_channel_type;



	if (!ieee80211_set_channel_type(local, sdata, channel_type))

	if (!ieee80211_set_channel_type(local, sdata, channel_type))

		return -EBUSY;

		return -EBUSY;





	old_oper = local->oper_channel;

	local->oper_channel = chan;

	local->oper_channel = chan;





	/* Update driver if changes were actually made. */

	/* auto-detects changes */

	if ((old_oper != local->oper_channel) ||

	ieee80211_hw_config(local, 0);

	    (old_oper_type != local->_oper_channel_type))

		ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);



	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;

	return 0;

}

}