diff options
| author | Eliad Peller <eliad@wizery.com> | 2011-10-20 19:05:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:44:44 -0800 |
| commit | a7870d687773d35a18bc5af7fc7a81963fe2fa02 (patch) | |
| tree | a31cc1706d10a16e7b3526b15fd7d8d922847443 /net | |
| parent | 0ecc0ae0b8a9d86cd1adc68506c5d4bd77d740cc (diff) | |
mac80211: config hw when going back on-channel
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 <eliad@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -rw-r--r-- | 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 94942f495089..7737f204d3f6 100644 --- a/net/mac80211/work.c +++ b/net/mac80211/work.c @@ -1093,7 +1093,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. @@ -1103,7 +1102,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, |