Merge commit 'garage/master'

[wpasupplicant] / wpa_supplicant / wpa_supplicant_i.h

diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 74838c9..63984d8 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -248,13 +248,13 @@ struct wpa_client_mlme {
 
        int cts_protect_erp_frames;
 
-       int phymode; /* current mode; WPA_MODE_IEEE80211A, .. */
-       struct wpa_hw_modes *modes;
+       hostapd_hw_mode phymode; /* current mode */
+       struct hostapd_hw_modes *modes;
        size_t num_modes;
        unsigned int hw_modes; /* bitfield of allowed hardware modes;
-                               * (1 << MODE_*) */
+                               * (1 << HOSTAPD_MODE_*) */
        int num_curr_rates;
-       struct wpa_rate_data *curr_rates;
+       struct hostapd_rate_data *curr_rates;
        int freq; /* The current frequency in MHz */
        int channel; /* The current IEEE 802.11 channel number */
 
@@ -329,6 +329,7 @@ struct wpa_supplicant {
        struct ctrl_iface_priv *ctrl_iface;
 
        wpa_states wpa_state;
+       int scanning;
        int new_connection;
        int reassociated_connection;
 
@@ -431,6 +432,8 @@ int wpa_supplicant_scard_init(struct wpa_supplicant *wpa_s,
 /* scan.c */
 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);
 
 /* events.c */
 void wpa_supplicant_mark_disassoc(struct wpa_supplicant *wpa_s);