Updated through tag hostap_2_5 from git://w1.fi/hostap.git

[mech_eap.git] / libeap / src / rsn_supp / wpa_ie.h

diff --git a/libeap/src/rsn_supp/wpa_ie.h b/libeap/src/rsn_supp/wpa_ie.h
index 94518d8..fe95af0 100644 (file)
--- a/libeap/src/rsn_supp/wpa_ie.h
+++ b/libeap/src/rsn_supp/wpa_ie.h
@@ -2,19 +2,15 @@
  * wpa_supplicant - WPA/RSN IE and KDE definitions
  * Copyright (c) 2004-2007, 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
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #ifndef WPA_IE_H
 #define WPA_IE_H
 
+struct wpa_sm;
+
 struct wpa_eapol_ie_parse {
        const u8 *wpa_ie;
        size_t wpa_ie_len;
@@ -39,14 +35,34 @@ struct wpa_eapol_ie_parse {
        const u8 *igtk;
        size_t igtk_len;
 #endif /* CONFIG_IEEE80211W */
-#ifdef CONFIG_IEEE80211R
        const u8 *mdie;
        size_t mdie_len;
        const u8 *ftie;
        size_t ftie_len;
        const u8 *reassoc_deadline;
        const u8 *key_lifetime;
-#endif /* CONFIG_IEEE80211R */
+       const u8 *lnkid;
+       size_t lnkid_len;
+       const u8 *ext_capab;
+       size_t ext_capab_len;
+       const u8 *supp_rates;
+       size_t supp_rates_len;
+       const u8 *ext_supp_rates;
+       size_t ext_supp_rates_len;
+       const u8 *ht_capabilities;
+       const u8 *vht_capabilities;
+       const u8 *supp_channels;
+       size_t supp_channels_len;
+       const u8 *supp_oper_classes;
+       size_t supp_oper_classes_len;
+       u8 qosinfo;
+       u16 aid;
+       const u8 *wmm;
+       size_t wmm_len;
+#ifdef CONFIG_P2P
+       const u8 *ip_addr_req;
+       const u8 *ip_addr_alloc;
+#endif /* CONFIG_P2P */
 };
 
 int wpa_supplicant_parse_ies(const u8 *buf, size_t len,