Commit 8bb89485 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

cfg80211: always get BSS

Multiple problems were reported due to interaction
between wpa_supplicant and the wext compat code in
cfg80211, which appear to be due to it not getting
any bss pointer here when wpa_supplicant sets all
parameters -- do that now. We should still get the
bss after doing an extra scan, but that appears to
increase the time we need for connecting enough to
sometimes cause timeouts.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Tested-by: Hin-Tak Leung <hintak.leung@gmail.com>,
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b7a79404
...@@ -762,9 +762,8 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev, ...@@ -762,9 +762,8 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev,
wdev->conn->params.ssid = wdev->ssid; wdev->conn->params.ssid = wdev->ssid;
wdev->conn->params.ssid_len = connect->ssid_len; wdev->conn->params.ssid_len = connect->ssid_len;
/* don't care about result -- but fill bssid & channel */ /* see if we have the bss already */
if (!wdev->conn->params.bssid || !wdev->conn->params.channel) bss = cfg80211_get_conn_bss(wdev);
bss = cfg80211_get_conn_bss(wdev);
wdev->sme_state = CFG80211_SME_CONNECTING; wdev->sme_state = CFG80211_SME_CONNECTING;
wdev->connect_keys = connkeys; wdev->connect_keys = connkeys;
......
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