diff options
author | Arik Nemtsov <arik@wizery.com> | 2012-02-27 17:41:33 -0500 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2012-02-28 06:25:10 -0500 |
commit | b9239b665889582835fbd54730902eee08aa42d7 (patch) | |
tree | eeb5b52ad23c4c707279a99427a273e194b30260 /drivers/net/wireless/wl12xx | |
parent | 18aa755b84715f36e2811734f95cb822bcacfd89 (diff) |
wl12xx: flush Tx during suspend and 802.11h chan switch
Flush our Tx queues before suspending or changing the channel due to a
channel_switch element in the AP beacon.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx')
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 712e38530153..ad1a4addaab5 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c | |||
@@ -1737,6 +1737,8 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw, | |||
1737 | wl1271_debug(DEBUG_MAC80211, "mac80211 suspend wow=%d", !!wow); | 1737 | wl1271_debug(DEBUG_MAC80211, "mac80211 suspend wow=%d", !!wow); |
1738 | WARN_ON(!wow || !wow->any); | 1738 | WARN_ON(!wow || !wow->any); |
1739 | 1739 | ||
1740 | wl1271_tx_flush(wl); | ||
1741 | |||
1740 | wl->wow_enabled = true; | 1742 | wl->wow_enabled = true; |
1741 | wl12xx_for_each_wlvif(wl, wlvif) { | 1743 | wl12xx_for_each_wlvif(wl, wlvif) { |
1742 | ret = wl1271_configure_suspend(wl, wlvif); | 1744 | ret = wl1271_configure_suspend(wl, wlvif); |
@@ -4496,6 +4498,8 @@ static void wl12xx_op_channel_switch(struct ieee80211_hw *hw, | |||
4496 | 4498 | ||
4497 | wl1271_debug(DEBUG_MAC80211, "mac80211 channel switch"); | 4499 | wl1271_debug(DEBUG_MAC80211, "mac80211 channel switch"); |
4498 | 4500 | ||
4501 | wl1271_tx_flush(wl); | ||
4502 | |||
4499 | mutex_lock(&wl->mutex); | 4503 | mutex_lock(&wl->mutex); |
4500 | 4504 | ||
4501 | if (unlikely(wl->state == WL1271_STATE_OFF)) { | 4505 | if (unlikely(wl->state == WL1271_STATE_OFF)) { |