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: upstream/snapshot3+hdmi~8468^2^2~75 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6911bf0453e0d6ea8eb694a4ce67a68d071c538e;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Cc: stable@kernel.org # 2.6.39+ Signed-off-by: John W. Linville --- 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,