wl12xx: make WL1271_FLAG_IF_INITIALIZED per-vif

Make the initialization flag per-vif, and add some checks for it.

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

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 9042445e0d039b1c04f57bc98cb6af2c9d8c3710..fb5951cb69e14b4f0ffa898b6f1a6c4c59bc9ba3 100644 (file)
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -1817,14 +1817,20 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
 
        wl1271_debug(DEBUG_MAC80211, "mac80211 stop");
 
-       mutex_lock(&wl_list_mutex);
-       list_del(&wl->list);
-
+       mutex_lock(&wl->mutex);
+       if (wl->state == WL1271_STATE_OFF) {
+               mutex_unlock(&wl->mutex);
+               return;
+       }
        /*
         * this must be before the cancel_work calls below, so that the work
         * functions don't perform further work.
         */
        wl->state = WL1271_STATE_OFF;
+       mutex_unlock(&wl->mutex);
+
+       mutex_lock(&wl_list_mutex);
+       list_del(&wl->list);
        mutex_unlock(&wl_list_mutex);
 
        wl1271_disable_interrupts(wl);
@@ -1971,7 +1977,6 @@ static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif)
 
        setup_timer(&wlvif->rx_streaming_timer, wl1271_rx_streaming_timer,
                    (unsigned long) wlvif);
-
        return 0;
 }
 
@@ -2069,7 +2074,8 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
         * get here before __wl1271_op_remove_interface is complete, so
         * opt out if that is the case.
         */
-       if (test_bit(WL1271_FLAG_IF_INITIALIZED, &wl->flags)) {
+       if (test_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags) ||
+           test_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags)) {
                ret = -EBUSY;
                goto out;
        }
@@ -2129,7 +2135,7 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
 
        wl->vif = vif;
        list_add(&wlvif->list, &wl->wlvif_list);
-       set_bit(WL1271_FLAG_IF_INITIALIZED, &wl->flags);
+       set_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags);
 
        if (wlvif->bss_type == BSS_TYPE_AP_BSS)
                wl->ap_count++;
@@ -2155,6 +2161,9 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
 
        wl1271_debug(DEBUG_MAC80211, "mac80211 remove interface");
 
+       if (!test_and_clear_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags))
+               return;
+
        /* because of hardware recovery, we may get here twice */
        if (wl->state != WL1271_STATE_ON)
                return;
@@ -2224,8 +2233,14 @@ static void wl1271_op_remove_interface(struct ieee80211_hw *hw,
                                       struct ieee80211_vif *vif)
 {
        struct wl1271 *wl = hw->priv;
+       struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
 
        mutex_lock(&wl->mutex);
+
+       if (wl->state == WL1271_STATE_OFF ||
+           !test_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags))
+               goto out;
+
        /*
         * wl->vif can be null here if someone shuts down the interface
         * just when hardware recovery has been started.
@@ -2234,7 +2249,7 @@ static void wl1271_op_remove_interface(struct ieee80211_hw *hw,
                WARN_ON(wl->vif != vif);
                __wl1271_op_remove_interface(wl, vif, true);
        }
-
+out:
        mutex_unlock(&wl->mutex);
        cancel_work_sync(&wl->recovery_work);
 }
@@ -3843,6 +3858,9 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
        if (unlikely(wl->state == WL1271_STATE_OFF))
                goto out;
 
+       if (unlikely(!test_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags)))
+               goto out;
+
        ret = wl1271_ps_elp_wakeup(wl);
        if (ret < 0)
                goto out;

diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 5b5c930933475c027773b80d3011bdff52dad66d..740a9b19cea1114c53c81bc51eda78232dfc209d 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -322,7 +322,6 @@ enum wl12xx_flags {
        WL1271_FLAG_IDLE,
        WL1271_FLAG_PSPOLL_FAILURE,
        WL1271_FLAG_FW_TX_BUSY,
-       WL1271_FLAG_IF_INITIALIZED,
        WL1271_FLAG_DUMMY_PACKET_PENDING,
        WL1271_FLAG_SUSPENDED,
        WL1271_FLAG_PENDING_WORK,
@@ -332,6 +331,7 @@ enum wl12xx_flags {
 };
 
 enum wl12xx_vif_flags {
+       WLVIF_FLAG_INITIALIZED,
        WLVIF_FLAG_STA_ASSOCIATED,
        WLVIF_FLAG_IBSS_JOINED,
        WLVIF_FLAG_AP_STARTED,