From: Arik Nemtsov Date: Mon, 27 Feb 2012 22:41:33 +0000 (+0200) Subject: wl12xx: flush Tx during suspend and 802.11h chan switch X-Git-Tag: v3.4-rc1~177^2~108^2~39^2~13 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b9239b665889582835fbd54730902eee08aa42d7;p=karo-tx-linux.git 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 Signed-off-by: Luciano Coelho --- 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)) {