From 3ede9a220e286d43089829882c471f4c22142ac0 Mon Sep 17 00:00:00 2001
From: Eliad Peller <eliad@wizery.com>
Date: Mon, 10 Oct 2011 10:13:04 +0200
Subject: [PATCH] --- yaml --- r: 278679 b: refs/heads/master c:
 8181aecce9ea3731ff5554c6f9cf16bf249a61fa h: refs/heads/master i:   278677:
 e5184d9929e0a6dc18ae51e2951693c2e4bb5ef7   278675:
 ec57dd5db6cf29f06459666fae05bf1d755918cc   278671:
 3bf326f92d6e4b5a41106edd38ba8d206a46ca8d v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/wireless/wl12xx/main.c   | 6 +++---
 trunk/drivers/net/wireless/wl12xx/wl12xx.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 05a003c2b985..dc9b3bdebc1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c29bb001e448ef57e077db9f1c5ae864e3f8abab
+refs/heads/master: 8181aecce9ea3731ff5554c6f9cf16bf249a61fa
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
index 2fe0ee144a9d..63340ad8451d 100644
--- a/trunk/drivers/net/wireless/wl12xx/main.c
+++ b/trunk/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 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
 			    !!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/trunk/drivers/net/wireless/wl12xx/wl12xx.h b/trunk/drivers/net/wireless/wl12xx/wl12xx.h
index ea6b7293175a..9de57dd71c34 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/trunk/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 {