Optimize post-WPS scan based on channel used during provisioning

[thirdparty/hostap.git] / wpa_supplicant / wpa_supplicant_i.h

diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 707fac47d0654811873c8e653b670aea17576e8f..84d642cf671ec5d775e43ab4b9c868127d512577 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -1,6 +1,6 @@
 /*
  * wpa_supplicant - Internal definitions
- * Copyright (c) 2003-2009, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2003-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
@@ -194,6 +194,7 @@ struct wpa_global {
        struct wpas_dbus_priv *dbus;
        void **drv_priv;
        size_t drv_count;
+       struct os_time suspend_time;
 };
 
 
@@ -234,10 +235,8 @@ struct wpa_client_mlme {
 
        struct os_time last_probe;
 
-#define IEEE80211_AUTH_ALG_OPEN BIT(0)
-#define IEEE80211_AUTH_ALG_SHARED_KEY BIT(1)
-#define IEEE80211_AUTH_ALG_LEAP BIT(2)
-       unsigned int auth_algs; /* bitfield of allowed auth algs */
+       unsigned int auth_algs; /* bitfield of allowed auth algs
+                                * (WPA_AUTH_ALG_*) */
        int auth_alg; /* currently used IEEE 802.11 authentication algorithm */
        int auth_transaction;
 
@@ -323,6 +322,7 @@ struct wpa_supplicant {
        int disconnected; /* all connections disabled; i.e., do no reassociate
                           * before this has been cleared */
        struct wpa_ssid *current_ssid;
+       struct wpa_bss *current_bss;
        int ap_ies_from_associnfo;
        unsigned int assoc_freq;
 
@@ -414,6 +414,7 @@ struct wpa_supplicant {
                size_t ft_ies_len;
                u8 prev_bssid[ETH_ALEN];
                int prev_bssid_set;
+               int auth_alg;
        } sme;
 #endif /* CONFIG_SME */
 
@@ -424,6 +425,9 @@ struct wpa_supplicant {
        struct wpa_ssid *bgscan_ssid;
        const struct bgscan_ops *bgscan;
        void *bgscan_priv;
+
+       int after_wps;
+       unsigned int wps_freq;
 };
 
 
@@ -443,10 +447,6 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s,
 void wpa_supplicant_set_non_wpa_policy(struct wpa_supplicant *wpa_s,
                                       struct wpa_ssid *ssid);
 void wpa_supplicant_initiate_eapol(struct wpa_supplicant *wpa_s);
-struct wpa_scan_results *
-wpa_supplicant_get_scan_results(struct wpa_supplicant *wpa_s,
-                               struct scan_info *info, int new_scan);
-int wpa_supplicant_update_scan_results(struct wpa_supplicant *wpa_s);
 void wpa_clear_keys(struct wpa_supplicant *wpa_s, const u8 *addr);
 void wpa_supplicant_req_auth_timeout(struct wpa_supplicant *wpa_s,
                                     int sec, int usec);
@@ -486,19 +486,14 @@ void wpa_supplicant_deinit(struct wpa_global *global);
 int wpa_supplicant_scard_init(struct wpa_supplicant *wpa_s,
                              struct wpa_ssid *ssid);
 void wpa_supplicant_terminate_proc(struct wpa_global *global);
-
-/* scan.c */
-int wpa_supplicant_enabled_networks(struct wpa_config *conf);
-void wpa_supplicant_req_scan(struct wpa_supplicant *wpa_s, int sec, int usec);
-void wpa_supplicant_cancel_scan(struct wpa_supplicant *wpa_s);
-void wpa_supplicant_notify_scanning(struct wpa_supplicant *wpa_s,
-                                   int scanning);
-struct wpa_driver_scan_params;
-int wpa_supplicant_trigger_scan(struct wpa_supplicant *wpa_s,
-                               struct wpa_driver_scan_params *params);
+void wpa_supplicant_rx_eapol(void *ctx, const u8 *src_addr,
+                            const u8 *buf, size_t len);
 
 /* events.c */
 void wpa_supplicant_mark_disassoc(struct wpa_supplicant *wpa_s);
+void wpa_supplicant_connect(struct wpa_supplicant *wpa_s,
+                           struct wpa_bss *selected,
+                           struct wpa_ssid *ssid);
 
 /* eap_register.c */
 int eap_register_methods(void);