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

Commit e6562869 authored by Arik Nemtsov's avatar Arik Nemtsov Committed by John W. Linville
Browse files

wlcore: don't switch channels on disconnected STA vifs 



Sending the FW a channel switch command on a disconnected
vif may result in a beacon loss event. Avoid this corner case.

Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d8c5a48d

drivers/net/wireless/ti/wlcore/main.c

+7 −0
Original line number Diff line number Diff line
@@ -5192,6 +5192,10 @@ static void wl12xx_op_channel_switch(struct ieee80211_hw *hw, 
	if (unlikely(wl->state == WLCORE_STATE_OFF)) {

		wl12xx_for_each_wlvif_sta(wl, wlvif) {

			struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);



			if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))

				continue;



			ieee80211_chswitch_done(vif, false);

		}

		goto out;
@@ -5207,6 +5211,9 @@ static void wl12xx_op_channel_switch(struct ieee80211_hw *hw, 
	wl12xx_for_each_wlvif_sta(wl, wlvif) {

		unsigned long delay_usec;



		if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))

			continue;



		ret = wl->ops->channel_switch(wl, wlvif, ch_switch);

		if (ret)

			goto out_sleep;