From: Eliad Peller Date: Thu, 20 Oct 2011 17:05:50 +0000 (+0200) Subject: mac80211: config hw when going back on-channel X-Git-Tag: v3.0.9~24 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=42c6d01ce89d43598fc804cf7c141d3252fe93b5;p=karo-tx-linux.git 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 Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/mac80211/work.c b/net/mac80211/work.c index 0199f979aa45..52b758dbff5b 100644 --- a/net/mac80211/work.c +++ b/net/mac80211/work.c @@ -1067,7 +1067,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. @@ -1077,7 +1076,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,