Commit ddb40550 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

rt2x00: change order when stop beaconing 



When no beaconing is needed, first stop beacon queue (disable beaconing
globally) to avoid possible sending of not prepared beacon on short
period after clearing beacon and before stop of BCN queue.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 88ff2f45

drivers/net/wireless/rt2x00/rt2x00mac.c

+6 −6
Original line number Diff line number Diff line
@@ -628,12 +628,6 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, 
		if (!bss_conf->enable_beacon && intf->enable_beacon) {

			rt2x00dev->intf_beaconing--;

			intf->enable_beacon = false;

			/*

			 * Clear beacon in the H/W for this vif. This is needed

			 * to disable beaconing on this particular interface

			 * and keep it running on other interfaces.

			 */

			rt2x00queue_clear_beacon(rt2x00dev, vif);



			if (rt2x00dev->intf_beaconing == 0) {

				/*
@@ -642,6 +636,12 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, 
				 */

				rt2x00queue_stop_queue(rt2x00dev->bcn);

			}

			/*

			 * Clear beacon in the H/W for this vif. This is needed

			 * to disable beaconing on this particular interface

			 * and keep it running on other interfaces.

			 */

			rt2x00queue_clear_beacon(rt2x00dev, vif);

		} else if (bss_conf->enable_beacon && !intf->enable_beacon) {

			rt2x00dev->intf_beaconing++;

			intf->enable_beacon = true;

CRA Git | Maintained and supported by SUSTech CRA and CCSE