From 6f0ed15d326b99da13423e6b7a04187c6a7c81bc Mon Sep 17 00:00:00 2001
From: Luciano Coelho <coelho@ti.com>
Date: Tue, 20 Nov 2012 11:03:31 +0200
Subject: [PATCH] --- yaml --- r: 352159 b: refs/heads/master c:
 ef08d0281a90781b07d2030c1c69f4fb2f156267 h: refs/heads/master i:   352157:
 7aded0f00584dbe5684c56e05d786cbeda9f9078   352155:
 ca131307895f7ca252e8b9f5ea3a9a4cca9e3793   352151:
 bd1aee35800ac03e13fa83dc06d985efa70505b0   352143:
 b572a1bc6fe25d0ece888602b4d7ba38aae55954   352127:
 303694cf228a8dfc28fc9081e72180bb16372f4a v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/net/wireless/ti/wlcore/main.c | 26 ++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 730fd104a0f1..41c005e15e64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8e27820f27155d2eaea2426b10bac810c293f3b
+refs/heads/master: ef08d0281a90781b07d2030c1c69f4fb2f156267
diff --git a/trunk/drivers/net/wireless/ti/wlcore/main.c b/trunk/drivers/net/wireless/ti/wlcore/main.c
index d425bd5eda7e..e488056f145e 100644
--- a/trunk/drivers/net/wireless/ti/wlcore/main.c
+++ b/trunk/drivers/net/wireless/ti/wlcore/main.c
@@ -3929,19 +3929,19 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
 		       BSS_CHANGED_ASSOC)) {
 		rcu_read_lock();
 		sta = ieee80211_find_sta(vif, bss_conf->bssid);
-		if (!sta)
-			goto sta_not_found;
-
-		/* save the supp_rates of the ap */
-		sta_rate_set = sta->supp_rates[wlvif->band];
-		if (sta->ht_cap.ht_supported)
-			sta_rate_set |=
-			  (sta->ht_cap.mcs.rx_mask[0] << HW_HT_RATES_OFFSET) |
-			  (sta->ht_cap.mcs.rx_mask[1] << HW_MIMO_RATES_OFFSET);
-		sta_ht_cap = sta->ht_cap;
-		sta_exists = true;
-
-sta_not_found:
+		if (sta) {
+			u8 *rx_mask = sta->ht_cap.mcs.rx_mask;
+
+			/* save the supp_rates of the ap */
+			sta_rate_set = sta->supp_rates[wlvif->band];
+			if (sta->ht_cap.ht_supported)
+				sta_rate_set |=
+					(rx_mask[0] << HW_HT_RATES_OFFSET) |
+					(rx_mask[1] << HW_MIMO_RATES_OFFSET);
+			sta_ht_cap = sta->ht_cap;
+			sta_exists = true;
+		}
+
 		rcu_read_unlock();
 	}