dbus: Fix passive/active scans in some cases

[libeap.git] / wpa_supplicant / sme.h

diff --git a/wpa_supplicant/sme.h b/wpa_supplicant/sme.h
index 2780041..3ec8cc9 100644 (file)
--- a/wpa_supplicant/sme.h
+++ b/wpa_supplicant/sme.h
@@ -1,6 +1,6 @@
 /*
  * wpa_supplicant - SME
- * Copyright (c) 2009, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2009-2010, Jouni Malinen <j@w1.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -18,7 +18,9 @@
 #ifdef CONFIG_SME
 
 void sme_authenticate(struct wpa_supplicant *wpa_s,
-                     struct wpa_scan_res *bss, struct wpa_ssid *ssid);
+                     struct wpa_bss *bss, struct wpa_ssid *ssid);
+void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode,
+                  const u8 *bssid, u16 auth_type);
 void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data);
 int sme_update_ft_ies(struct wpa_supplicant *wpa_s, const u8 *md,
                      const u8 *ies, size_t ies_len);
@@ -28,11 +30,13 @@ void sme_event_auth_timed_out(struct wpa_supplicant *wpa_s,
                              union wpa_event_data *data);
 void sme_event_assoc_timed_out(struct wpa_supplicant *wpa_s,
                               union wpa_event_data *data);
+void sme_event_disassoc(struct wpa_supplicant *wpa_s,
+                       union wpa_event_data *data);
 
 #else /* CONFIG_SME */
 
 static inline void sme_authenticate(struct wpa_supplicant *wpa_s,
-                                   struct wpa_scan_res *bss,
+                                   struct wpa_bss *bss,
                                    struct wpa_ssid *ssid)
 {
 }
@@ -64,6 +68,11 @@ static inline void sme_event_assoc_timed_out(struct wpa_supplicant *wpa_s,
 {
 }
 
+static inline void sme_event_disassoc(struct wpa_supplicant *wpa_s,
+                                     union wpa_event_data *data)
+{
+}
+
 #endif /* CONFIG_SME */
 
 #endif /* SME_H */