hostapd: Fix internal crypto build without TLS

[wpasupplicant] / hostapd / wme.h

diff --git a/hostapd/wme.h b/hostapd/wme.h
index 9f4ec25..1ddb647 100644 (file)
--- a/hostapd/wme.h
+++ b/hostapd/wme.h
@@ -16,115 +16,21 @@
 #ifndef WME_H
 #define WME_H
 
-#ifdef __linux__
-#include <endian.h>
-#endif /* __linux__ */
-
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-#include <sys/types.h>
-#include <sys/endian.h>
-#endif /* defined(__FreeBSD__) || defined(__NetBSD__) ||
-       * defined(__DragonFly__) */
-
-
-struct wme_information_element {
-       /* required fields for WME version 1 */
-       u8 oui[3];
-       u8 oui_type;
-       u8 oui_subtype;
-       u8 version;
-       u8 acInfo;
-
-} __attribute__ ((packed));
-
-struct wme_ac_parameter {
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-       /* byte 1 */
-       u8      aifsn:4,
-               acm:1,
-               aci:2,
-               reserved:1;
-
-       /* byte 2 */
-       u8      eCWmin:4,
-               eCWmax:4;
-#elif __BYTE_ORDER == __BIG_ENDIAN
-       /* byte 1 */
-       u8      reserved:1,
-               aci:2,
-               acm:1,
-               aifsn:4;
-
-       /* byte 2 */
-       u8      eCWmax:4,
-               eCWmin:4;
-#else
-#error "Please fix <endian.h>"
-#endif
-
-       /* bytes 3 & 4 */
-       le16 txopLimit;
-} __attribute__ ((packed));
-
-struct wme_parameter_element {
-       /* required fields for WME version 1 */
-       u8 oui[3];
-       u8 oui_type;
-       u8 oui_subtype;
-       u8 version;
-       u8 acInfo;
-       u8 reserved;
-       struct wme_ac_parameter ac[4];
-
-} __attribute__ ((packed));
-
-struct wme_tspec_info_element {
-       u8 eid;
-       u8 length;
-       u8 oui[3];
-       u8 oui_type;
-       u8 oui_subtype;
-       u8 version;
-       u16 ts_info;
-       u16 nominal_msdu_size;
-       u16 maximum_msdu_size;
-       u32 minimum_service_interval;
-       u32 maximum_service_interval;
-       u32 inactivity_interval;
-       u32 start_time;
-       u32 minimum_data_rate;
-       u32 mean_data_rate;
-       u32 maximum_burst_size;
-       u32 minimum_phy_rate;
-       u32 peak_data_rate;
-       u32 delay_bound;
-       u16 surplus_bandwidth_allowance;
-       u16 medium_time;
-} __attribute__ ((packed));
-
-
-/* Access Categories */
-enum {
-       WME_AC_BK = 1,
-       WME_AC_BE = 0,
-       WME_AC_VI = 2,
-       WME_AC_VO = 3
-};
-
 struct ieee80211_mgmt;
 
-u8 * hostapd_eid_wme(struct hostapd_data *hapd, u8 *eid);
-int hostapd_eid_wme_valid(struct hostapd_data *hapd, u8 *eid, size_t len);
+u8 * hostapd_eid_wmm(struct hostapd_data *hapd, u8 *eid);
+int hostapd_eid_wmm_valid(struct hostapd_data *hapd, u8 *eid, size_t len);
 #ifdef NEED_MLME
-int hostapd_wme_sta_config(struct hostapd_data *hapd, struct sta_info *sta);
+int hostapd_wmm_sta_config(struct hostapd_data *hapd, struct sta_info *sta);
 #else /* NEED_MLME */
-static inline int hostapd_wme_sta_config(struct hostapd_data *hapd,
+static inline int hostapd_wmm_sta_config(struct hostapd_data *hapd,
                                         struct sta_info *sta)
 {
        return 0;
 }
 #endif /* NEED_MLME */
-void hostapd_wme_action(struct hostapd_data *hapd, struct ieee80211_mgmt *mgmt,
+void hostapd_wmm_action(struct hostapd_data *hapd, struct ieee80211_mgmt *mgmt,
                        size_t len);
+int wmm_process_tspec(struct wmm_tspec_element *tspec);
 
 #endif /* WME_H */