wl12xx: make WL1271_FLAG_STA_STATE_SENT flag per-vif

This flag should be set per-vif, rather than globally.

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 2fe0ee144a9dc3c1c2d2b6bcb02a8a048a7d0ce5..63340ad8451dc2bd2a150e655010b666e3c573d7 100644 (file)
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -408,7 +408,7 @@ static int wl1271_check_operstate(struct wl1271 *wl, struct wl12xx_vif *wlvif,
        if (operstate != IF_OPER_UP)
                return 0;
 
-       if (test_and_set_bit(WL1271_FLAG_STA_STATE_SENT, &wl->flags))
+       if (test_and_set_bit(WLVIF_FLAG_STA_STATE_SENT, &wlvif->flags))
                return 0;
 
        ret = wl12xx_cmd_set_peer_state(wl, wlvif->sta.hlid);
@@ -3624,8 +3624,8 @@ sta_not_found:
                            !!test_and_clear_bit(WLVIF_FLAG_STA_ASSOCIATED,
                                                 &wlvif->flags);
                        bool was_ifup =
-                           !!test_and_clear_bit(WL1271_FLAG_STA_STATE_SENT,
-                                                &wl->flags);
+                           !!test_and_clear_bit(WLVIF_FLAG_STA_STATE_SENT,
+                                                &wlvif->flags);
                        wlvif->aid = 0;
 
                        /* free probe-request template */

diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index ea6b7293175a3361454563eedc5570670d837468..9de57dd71c34f831d6d54b4ceb5fcd65d4639a2d 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -321,7 +321,6 @@ enum wl12xx_flags {
        WL1271_FLAG_IRQ_RUNNING,
        WL1271_FLAG_IDLE,
        WL1271_FLAG_PSPOLL_FAILURE,
-       WL1271_FLAG_STA_STATE_SENT,
        WL1271_FLAG_FW_TX_BUSY,
        WL1271_FLAG_IF_INITIALIZED,
        WL1271_FLAG_DUMMY_PACKET_PENDING,
@@ -339,6 +338,7 @@ enum wl12xx_vif_flags {
        WLVIF_FLAG_AP_STARTED,
        WLVIF_FLAG_PSM,
        WLVIF_FLAG_PSM_REQUESTED,
+       WLVIF_FLAG_STA_STATE_SENT,
 };
 
 struct wl1271_link {