1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/net/wireless/wl12xx/cmd.c b/drivers/net/wireless/wl12xx/cmd.c
index 1ef212f6440f..3414fc11e9ba 100644
--- a/drivers/net/wireless/wl12xx/cmd.c
+++ b/drivers/net/wireless/wl12xx/cmd.c
@@ -1818,6 +1818,14 @@ int wl12xx_croc(struct wl1271 *wl, u8 role_id)
                 goto out;
 
         __clear_bit(role_id, wl->roc_map);
+
+        /*
+         * Rearm the tx watchdog when removing the last ROC. This prevents
+         * recoveries due to just finished ROCs - when Tx hasn't yet had
+         * a chance to get out.
+         */
+        if (find_first_bit(wl->roc_map, WL12XX_MAX_ROLES) >= WL12XX_MAX_ROLES)
+                wl12xx_rearm_tx_watchdog_locked(wl);
 out:
         return ret;
 }