diff options
| author |   Arik Nemtsov <arik@wizery.com> | 2012-02-28 00:41:33 +0200 |
|---|---|---|
| committer |   Luciano Coelho <coelho@ti.com> | 2012-02-28 13:25:10 +0200 |
| commit | b9239b665889582835fbd54730902eee08aa42d7 (patch) | |
| tree | eeb5b52ad23c4c707279a99427a273e194b30260 /drivers/net/wireless/wl12xx/main.c | |
| parent | wl12xx: flush all Tx queues on tx_flush timeout (diff) | |
| download | linux-dev-b9239b665889582835fbd54730902eee08aa42d7.tar.xz linux-dev-b9239b665889582835fbd54730902eee08aa42d7.zip | |
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 '')
| -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, wl1271_debug(DEBUG_MAC80211, "mac80211 suspend wow=%d", !!wow); WARN_ON(!wow || !wow->any); + wl1271_tx_flush(wl); + wl->wow_enabled = true; wl12xx_for_each_wlvif(wl, wlvif) { ret = wl1271_configure_suspend(wl, wlvif); @@ -4496,6 +4498,8 @@ static void wl12xx_op_channel_switch(struct ieee80211_hw *hw, wl1271_debug(DEBUG_MAC80211, "mac80211 channel switch"); + wl1271_tx_flush(wl); + mutex_lock(&wl->mutex); if (unlikely(wl->state == WL1271_STATE_OFF)) { |