From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Thu, 10 Dec 2009 10:27:46 +0000 (+0200)
Subject: Move vendor-specific IE type defines away from driver.h
X-Git-Tag: hostap_0_7_1~371
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fe82961978a4f30f871c5691c7b99fcd6c44fba;p=thirdparty%2Fhostap.git

Move vendor-specific IE type defines away from driver.h

These are generic IEEE 802.11 defines and do not really need to be in
the driver interface specific header file.
---

diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h
index 5efd55e12..4881e39a0 100644
--- a/src/common/ieee802_11_defs.h
+++ b/src/common/ieee802_11_defs.h
@@ -476,6 +476,8 @@ struct ieee80211_ht_operation {
 
 #define OUI_MICROSOFT 0x0050f2 /* Microsoft (also used in Wi-Fi specs)
 				* 00:50:F2 */
+#define WPA_IE_VENDOR_TYPE 0x0050f201
+#define WPS_IE_VENDOR_TYPE 0x0050f204
 
 #define WMM_OUI_TYPE 2
 #define WMM_OUI_SUBTYPE_INFORMATION_ELEMENT 0
diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index c5a158a59..e1565530c 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1711,8 +1711,6 @@ void wpa_supplicant_sta_rx(void *ctx, const u8 *buf, size_t len,
 			   struct ieee80211_rx_status *rx_status);
 
 const u8 * wpa_scan_get_ie(const struct wpa_scan_res *res, u8 ie);
-#define WPA_IE_VENDOR_TYPE 0x0050f201
-#define WPS_IE_VENDOR_TYPE 0x0050f204
 const u8 * wpa_scan_get_vendor_ie(const struct wpa_scan_res *res,
 				  u32 vendor_type);
 struct wpabuf * wpa_scan_get_vendor_ie_multi(const struct wpa_scan_res *res,