automake build system

[mech_eap.orig] / wpa_supplicant / mlme.h

diff --git a/wpa_supplicant/mlme.h b/wpa_supplicant/mlme.h
index cc58a5b..5db3665 100644 (file)
--- a/wpa_supplicant/mlme.h
+++ b/wpa_supplicant/mlme.h
@@ -19,19 +19,25 @@
 
 struct wpa_supplicant;
 
+struct ieee80211_rx_status {
+       int freq;
+        int channel;
+        int ssi;
+};
+
 #ifdef CONFIG_CLIENT_MLME
 
 int ieee80211_sta_init(struct wpa_supplicant *wpa_s);
 void ieee80211_sta_deinit(struct wpa_supplicant *wpa_s);
-int ieee80211_sta_req_scan(struct wpa_supplicant *wpa_s, const u8 *ssid,
-                          size_t ssid_len);
+int ieee80211_sta_req_scan(struct wpa_supplicant *wpa_s,
+                          struct wpa_driver_scan_params *params);
 int ieee80211_sta_deauthenticate(struct wpa_supplicant *wpa_s, u16 reason);
 int ieee80211_sta_disassociate(struct wpa_supplicant *wpa_s, u16 reason);
 int ieee80211_sta_associate(struct wpa_supplicant *wpa_s,
                            struct wpa_driver_associate_params *params);
 int ieee80211_sta_get_ssid(struct wpa_supplicant *wpa_s, u8 *ssid,
                           size_t *len);
-void ieee80211_sta_free_hw_features(struct wpa_hw_modes *hw_features,
+void ieee80211_sta_free_hw_features(struct hostapd_hw_modes *hw_features,
                                    size_t num_hw_features);
 void ieee80211_sta_rx(struct wpa_supplicant *wpa_s, const u8 *buf, size_t len,
                      struct ieee80211_rx_status *rx_status);
@@ -42,8 +48,6 @@ int ieee80211_sta_update_ft_ies(struct wpa_supplicant *wpa_s, const u8 *md,
 int ieee80211_sta_send_ft_action(struct wpa_supplicant *wpa_s, u8 action,
                                 const u8 *target_ap,
                                 const u8 *ies, size_t ies_len);
-int ieee80211_sta_set_probe_req_ie(struct wpa_supplicant *wpa_s, const u8 *ies,
-                                  size_t ies_len);
 
 #else /* CONFIG_CLIENT_MLME */
 
@@ -57,7 +61,7 @@ static inline void ieee80211_sta_deinit(struct wpa_supplicant *wpa_s)
 }
 
 static inline int ieee80211_sta_req_scan(struct wpa_supplicant *wpa_s,
-                                        const u8 *ssid, size_t ssid_len)
+                                        struct wpa_driver_scan_params *params)
 {
        return -1;
 }
@@ -88,7 +92,7 @@ static inline int ieee80211_sta_get_ssid(struct wpa_supplicant *wpa_s,
 }
 
 static inline void
-ieee80211_sta_free_hw_features(struct wpa_hw_modes *hw_features,
+ieee80211_sta_free_hw_features(struct hostapd_hw_modes *hw_features,
                               size_t num_hw_features)
 {
 }
@@ -120,13 +124,6 @@ ieee80211_sta_send_ft_action(struct wpa_supplicant *wpa_s, u8 action,
        return -1;
 }
 
-static inline int
-ieee80211_sta_set_probe_req_ie(struct wpa_supplicant *wpa_s, const u8 *ies,
-                              size_t ies_len)
-{
-       return -1;
-}
-
 #endif /* CONFIG_CLIENT_MLME */
 
 #endif /* MLME_H */