aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/scan.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/scan.c')
-rw-r--r--net/mac80211/scan.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 0ea6adae3e06..0e70d7a160b4 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -517,8 +517,7 @@ static void ieee80211_scan_state_decision(struct ieee80211_local *local,
517 517
518 if (ieee80211_cfg_on_oper_channel(local)) { 518 if (ieee80211_cfg_on_oper_channel(local)) {
519 /* We're currently on operating channel. */ 519 /* We're currently on operating channel. */
520 if ((next_chan == local->oper_channel) && 520 if (next_chan == local->oper_channel)
521 (local->_oper_channel_type == NL80211_CHAN_NO_HT))
522 /* We don't need to move off of operating channel. */ 521 /* We don't need to move off of operating channel. */
523 local->next_scan_state = SCAN_SET_CHANNEL; 522 local->next_scan_state = SCAN_SET_CHANNEL;
524 else 523 else
@@ -620,8 +619,7 @@ static void ieee80211_scan_state_set_channel(struct ieee80211_local *local,
620 local->scan_channel = chan; 619 local->scan_channel = chan;
621 620
622 /* Only call hw-config if we really need to change channels. */ 621 /* Only call hw-config if we really need to change channels. */
623 if ((chan != local->hw.conf.channel) || 622 if (chan != local->hw.conf.channel)
624 (local->hw.conf.channel_type != NL80211_CHAN_NO_HT))
625 if (ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL)) 623 if (ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL))
626 skip = 1; 624 skip = 1;
627 625