Merge commit 'garage/master'

[wpasupplicant] / hostapd / ieee802_11.h

diff --git a/hostapd/ieee802_11.h b/hostapd/ieee802_11.h
index ca8ef93..c6b7ccb 100644 (file)
--- a/hostapd/ieee802_11.h
+++ b/hostapd/ieee802_11.h
@@ -19,18 +19,10 @@
 #include "ieee802_11_defs.h"
 #include "ieee802_11_common.h"
 
-struct hostapd_frame_info {
-       u32 phytype;
-       u32 channel;
-       u32 datarate;
-       u32 ssi_signal;
-
-       unsigned int passive_scan:1;
-};
-
 struct hostapd_iface;
 struct hostapd_data;
 struct sta_info;
+struct hostapd_frame_info;
 
 void ieee802_11_send_deauth(struct hostapd_data *hapd, u8 *addr, u16 reason);
 void ieee802_11_mgmt(struct hostapd_data *hapd, u8 *buf, size_t len,
@@ -38,11 +30,24 @@ void ieee802_11_mgmt(struct hostapd_data *hapd, u8 *buf, size_t len,
 void ieee802_11_mgmt_cb(struct hostapd_data *hapd, u8 *buf, size_t len,
                        u16 stype, int ok);
 void ieee802_11_print_ssid(char *buf, const u8 *ssid, u8 len);
-void ieee80211_michael_mic_failure(struct hostapd_data *hapd, const u8 *addr,
-                                  int local);
+#ifdef NEED_MLME
 int ieee802_11_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen);
 int ieee802_11_get_mib_sta(struct hostapd_data *hapd, struct sta_info *sta,
                           char *buf, size_t buflen);
+#else /* NEED_MLME */
+static inline int ieee802_11_get_mib(struct hostapd_data *hapd, char *buf,
+                                    size_t buflen)
+{
+       return 0;
+}
+
+static inline int ieee802_11_get_mib_sta(struct hostapd_data *hapd,
+                                        struct sta_info *sta,
+                                        char *buf, size_t buflen)
+{
+       return 0;
+}
+#endif /* NEED_MLME */
 u16 hostapd_own_capab_info(struct hostapd_data *hapd, struct sta_info *sta,
                           int probe);
 u8 * hostapd_eid_supp_rates(struct hostapd_data *hapd, u8 *eid);