41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 776308dd5fa8a41e8bbb79818a66bd68a7db757e Mon Sep 17 00:00:00 2001
|
|
From: Eliad Peller <eliad@wizery.com>
|
|
Date: Thu, 20 Oct 2011 19:05:50 +0200
|
|
Subject: [PATCH] mac80211: config hw when going back on-channel
|
|
|
|
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>
|
|
---
|
|
net/mac80211/work.c | 3 +--
|
|
1 files changed, 1 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/net/mac80211/work.c b/net/mac80211/work.c
|
|
index bf5be22..6c53b6d 100644
|
|
--- a/net/mac80211/work.c
|
|
+++ b/net/mac80211/work.c
|
|
@@ -1091,7 +1091,6 @@ static void ieee80211_work_work(struct work_struct *work)
|
|
}
|
|
|
|
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.
|
|
@@ -1101,7 +1100,7 @@ static void ieee80211_work_work(struct work_struct *work)
|
|
* 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,
|
|
--
|
|
1.7.6.2
|
|
|