summaryrefslogtreecommitdiffstats
path: root/net/wireless/scan.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-07-02 09:13:27 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 21:01:51 +0200
commit6829c878ecd24ff0ae41b4668c7e9d0f11b66942 (patch)
treeacf78b685d60694040953b4f61d768b95b79e45d /net/wireless/scan.c
parentcfg80211: connect/disconnect API (diff)
downloadlinux-6829c878ecd24ff0ae41b4668c7e9d0f11b66942.tar.xz
linux-6829c878ecd24ff0ae41b4668c7e9d0f11b66942.zip
cfg80211: emulate connect with auth/assoc
This adds code to cfg80211 so that drivers (mac80211 right now) that don't implement connect but rather auth/assoc can still be used with the nl80211 connect command. This will also be necessary for the wext compat code. Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/scan.c')
-rw-r--r--net/wireless/scan.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 261a06386822..82b33e708488 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -30,6 +30,13 @@ void cfg80211_scan_done(struct cfg80211_scan_request *request, bool aborted)
WARN_ON(request != wiphy_to_dev(request->wiphy)->scan_req);
+ /*
+ * This must be before sending the other events!
+ * Otherwise, wpa_supplicant gets completely confused with
+ * wext events.
+ */
+ cfg80211_sme_scan_done(dev);
+
if (aborted)
nl80211_send_scan_aborted(wiphy_to_dev(request->wiphy), dev);
else