wlcore: wait for command completion event when sending CMD_ROLE_STOP

We need to wait for the command completion event when we send the
CMD_ROLE_STOP event otherwise we may try to send CMD_ROLE_START too
soon and get out-of-sync with the firmware.

In some cases, the firmware may not send the event, so we wait for the
event or for the timeout, whichever comes first.

This patch is based on an earlier version by Eliad.

Cc: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
index a23949cdaebc832643a938edbf7acf990334a40c..20e1bd9238321e6d2eab682784f8e3cd9b6f8528 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/cmd.c
+++ b/drivers/net/wireless/ti/wlcore/cmd.c
@@ -497,6 +497,7 @@ int wl12xx_cmd_role_stop_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
        struct wl12xx_cmd_role_stop *cmd;
        int ret;
+       bool timeout = false;
 
        if (WARN_ON(wlvif->sta.hlid == WL12XX_INVALID_LINK_ID))
                return -EINVAL;
@@ -519,6 +520,17 @@ int wl12xx_cmd_role_stop_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif)
                goto out_free;
        }
 
+       /*
+        * Sometimes the firmware doesn't send this event, so we just
+        * time out without failing.  Queue recovery for other
+        * failures.
+        */
+       ret = wl1271_cmd_wait_for_event_or_timeout(wl,
+                                                  ROLE_STOP_COMPLETE_EVENT_ID,
+                                                  &timeout);
+       if (ret)
+               wl12xx_queue_recovery_work(wl);
+
        wl12xx_free_link(wl, wlvif, &wlvif->sta.hlid);
 
 out_free: