lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: config hw when going back on-channel

Browse Source 
When going back on-channel, we should reconfigure
the hw iff the hardware is not already configured
to the operational channel.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Cc: stable@kernel.org # 2.6.39+
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Eliad Peller
2011-10-20 19:05:50 +02:00
committed by John W. Linville
parent eaa7af2ae5
commit 6911bf0453
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/mac80211/work.c
View File

@@ -1091,7 +1091,6 @@ static void ieee80211_work_work(struct work_struct *work)
} }
if (!remain_off_channel && local->tmp_channel) { if (!remain_off_channel && local->tmp_channel) {
bool on_oper_chan = ieee80211_cfg_on_oper_channel(local);
local->tmp_channel = NULL; local->tmp_channel = NULL;
/* If tmp_channel wasn't operating channel, then /* If tmp_channel wasn't operating channel, then
* we need to go back on-channel. * we need to go back on-channel.
@@ -1101,7 +1100,7 @@ static void ieee80211_work_work(struct work_struct *work)
* we still need to do a hardware config. Currently, * we still need to do a hardware config. Currently,
* we cannot be here while scanning, however. * we cannot be here while scanning, however.
*/ */
if (ieee80211_cfg_on_oper_channel(local) && !on_oper_chan) if (!ieee80211_cfg_on_oper_channel(local))
ieee80211_hw_config(local, 0); ieee80211_hw_config(local, 0);
/* At the least, we need to disable offchannel_ps, /* At the least, we need to disable offchannel_ps,