aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/mac80211/work.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/work.c b/net/mac80211/work.c
index bf5be22a977c..6c53b6d1002b 100644
--- a/net/mac80211/work.c
+++ b/net/mac80211/work.c
@@ -1091,7 +1091,6 @@ static void ieee80211_work_work(struct work_struct *work)
1091 } 1091 }
1092 1092
1093 if (!remain_off_channel && local->tmp_channel) { 1093 if (!remain_off_channel && local->tmp_channel) {
1094 bool on_oper_chan = ieee80211_cfg_on_oper_channel(local);
1095 local->tmp_channel = NULL; 1094 local->tmp_channel = NULL;
1096 /* If tmp_channel wasn't operating channel, then 1095 /* If tmp_channel wasn't operating channel, then
1097 * we need to go back on-channel. 1096 * we need to go back on-channel.
@@ -1101,7 +1100,7 @@ static void ieee80211_work_work(struct work_struct *work)
1101 * we still need to do a hardware config. Currently, 1100 * we still need to do a hardware config. Currently,
1102 * we cannot be here while scanning, however. 1101 * we cannot be here while scanning, however.
1103 */ 1102 */
1104 if (ieee80211_cfg_on_oper_channel(local) && !on_oper_chan) 1103 if (!ieee80211_cfg_on_oper_channel(local))
1105 ieee80211_hw_config(local, 0); 1104 ieee80211_hw_config(local, 0);
1106 1105
1107 /* At the least, we need to disable offchannel_ps, 1106 /* At the least, we need to disable offchannel_ps,