UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Stanislaw Gruszka 2014-06-05 13:52:26 +02:00 committed by John W. Linville
parent 88ff2f45f2
commit ddb405506c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/wireless/rt2x00/rt2x00mac.c
View File

@ -628,12 +628,6 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
if (!bss_conf->enable_beacon && intf->enable_beacon) { if (!bss_conf->enable_beacon && intf->enable_beacon) {
rt2x00dev->intf_beaconing--; rt2x00dev->intf_beaconing--;
intf->enable_beacon = false; 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) { if (rt2x00dev->intf_beaconing == 0) {
/* /*
@ -642,6 +636,12 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
*/ */
rt2x00queue_stop_queue(rt2x00dev->bcn); 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) { } else if (bss_conf->enable_beacon && !intf->enable_beacon) {
rt2x00dev->intf_beaconing++; rt2x00dev->intf_beaconing++;
intf->enable_beacon = true; intf->enable_beacon = true;