From 8b6949af100b4b88ddd4df4b5b1ae54ff229403c Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Sat, 26 Sep 2009 14:42:53 +0200
Subject: [PATCH] --- yaml --- r: 166570 b: refs/heads/master c:
 8bb894859e9495a94f94af3ee4711c89cdf24a95 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/wireless/sme.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0bfd5f07fe47..54ba3bb37002 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7a794048ff30d53764c1e41ccb2bff7f7bec2a8
+refs/heads/master: 8bb894859e9495a94f94af3ee4711c89cdf24a95
diff --git a/trunk/net/wireless/sme.c b/trunk/net/wireless/sme.c
index 7fae7eee65de..93c3ed329204 100644
--- a/trunk/net/wireless/sme.c
+++ b/trunk/net/wireless/sme.c
@@ -762,9 +762,8 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev,
 		wdev->conn->params.ssid = wdev->ssid;
 		wdev->conn->params.ssid_len = connect->ssid_len;
 
-		/* don't care about result -- but fill bssid & channel */
-		if (!wdev->conn->params.bssid || !wdev->conn->params.channel)
-			bss = cfg80211_get_conn_bss(wdev);
+		/* see if we have the bss already */
+		bss = cfg80211_get_conn_bss(wdev);
 
 		wdev->sme_state = CFG80211_SME_CONNECTING;
 		wdev->connect_keys = connkeys;