diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-28 14:50:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-28 14:50:06 -0700 |
| commit | eb1cf0f8f7a9e5a6d573d5bd72c015686a042db0 (patch) | |
| tree | ee5e1e52ef663e1a4d19c7abd6477a8ed75fda41 /net/wireless/sme.c | |
| parent | 47379052b5c87707bc6e20a2a4f6ac156fb8357c (diff) | |
| parent | a0d97d6c7ceddc176b5eed171aa2a52e32cf3eda (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/wireless/sme.c')
| -rw-r--r-- | net/wireless/sme.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index 7fae7eee65d..93c3ed32920 100644 --- a/net/wireless/sme.c +++ b/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; |