[244/264] mac80211: config hw when going back on-channel
From: Greg KH <gregkh@suse.de>
Date: 2011-11-10 03:56:32
Also in:
lkml
3.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eliad Peller <redacted> commit 6911bf0453e0d6ea8eb694a4ce67a68d071c538e upstream. 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 <redacted> Signed-off-by: John W. Linville <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- net/mac80211/work.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
--- a/net/mac80211/work.c
+++ b/net/mac80211/work.c@@ -1093,7 +1093,6 @@ static void ieee80211_work_work(struct w } if (!remain_off_channel && local->tmp_channel) { - bool on_oper_chan = ieee80211_cfg_on_oper_channel(local); local->tmp_channel = NULL; /* If tmp_channel wasn't operating channel, then * we need to go back on-channel.
@@ -1103,7 +1102,7 @@ static void ieee80211_work_work(struct w * we still need to do a hardware config. Currently, * 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); /* At the least, we need to disable offchannel_ps,