Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6911bf04 authored by Eliad Peller's avatar Eliad Peller Committed by John W. Linville
Browse files

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: default avatarEliad Peller <eliad@wizery.com>
Cc: stable@kernel.org # 2.6.39+
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent eaa7af2a

net/mac80211/work.c

+1 −2
Original line number Diff line number Diff line
@@ -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,