Skip to content

Commit

Permalink
mac80211: clean up ieee80211_set_channel
Browse files Browse the repository at this point in the history
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: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Johannes Berg authored and John W. Linville committed Jun 5, 2012
1 parent 9dde642 commit 8a2ac26
Showing 1 changed file with 2 additions and 16 deletions.
18 changes: 2 additions & 16 deletions net/mac80211/cfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -1684,9 +1684,6 @@ 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);
Expand All @@ -1704,24 +1701,13 @@ static int ieee80211_set_channel(struct wiphy *wiphy,
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))
return -EBUSY;

old_oper = local->oper_channel;
local->oper_channel = chan;

/* Update driver if changes were actually made. */
if ((old_oper != local->oper_channel) ||
(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);
/* auto-detects changes */
ieee80211_hw_config(local, 0);

return 0;
}
Expand Down

0 comments on commit 8a2ac26

Please sign in to comment.