Commit 8181aecc authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho

wl12xx: make WL1271_FLAG_STA_STATE_SENT flag per-vif

This flag should be set per-vif, rather than globally.
Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent c29bb001
...@@ -408,7 +408,7 @@ static int wl1271_check_operstate(struct wl1271 *wl, struct wl12xx_vif *wlvif, ...@@ -408,7 +408,7 @@ static int wl1271_check_operstate(struct wl1271 *wl, struct wl12xx_vif *wlvif,
if (operstate != IF_OPER_UP) if (operstate != IF_OPER_UP)
return 0; 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; return 0;
ret = wl12xx_cmd_set_peer_state(wl, wlvif->sta.hlid); ret = wl12xx_cmd_set_peer_state(wl, wlvif->sta.hlid);
...@@ -3624,8 +3624,8 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl, ...@@ -3624,8 +3624,8 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
!!test_and_clear_bit(WLVIF_FLAG_STA_ASSOCIATED, !!test_and_clear_bit(WLVIF_FLAG_STA_ASSOCIATED,
&wlvif->flags); &wlvif->flags);
bool was_ifup = bool was_ifup =
!!test_and_clear_bit(WL1271_FLAG_STA_STATE_SENT, !!test_and_clear_bit(WLVIF_FLAG_STA_STATE_SENT,
&wl->flags); &wlvif->flags);
wlvif->aid = 0; wlvif->aid = 0;
/* free probe-request template */ /* free probe-request template */
......
...@@ -321,7 +321,6 @@ enum wl12xx_flags { ...@@ -321,7 +321,6 @@ enum wl12xx_flags {
WL1271_FLAG_IRQ_RUNNING, WL1271_FLAG_IRQ_RUNNING,
WL1271_FLAG_IDLE, WL1271_FLAG_IDLE,
WL1271_FLAG_PSPOLL_FAILURE, WL1271_FLAG_PSPOLL_FAILURE,
WL1271_FLAG_STA_STATE_SENT,
WL1271_FLAG_FW_TX_BUSY, WL1271_FLAG_FW_TX_BUSY,
WL1271_FLAG_IF_INITIALIZED, WL1271_FLAG_IF_INITIALIZED,
WL1271_FLAG_DUMMY_PACKET_PENDING, WL1271_FLAG_DUMMY_PACKET_PENDING,
...@@ -339,6 +338,7 @@ enum wl12xx_vif_flags { ...@@ -339,6 +338,7 @@ enum wl12xx_vif_flags {
WLVIF_FLAG_AP_STARTED, WLVIF_FLAG_AP_STARTED,
WLVIF_FLAG_PSM, WLVIF_FLAG_PSM,
WLVIF_FLAG_PSM_REQUESTED, WLVIF_FLAG_PSM_REQUESTED,
WLVIF_FLAG_STA_STATE_SENT,
}; };
struct wl1271_link { struct wl1271_link {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment