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 5efd55e128f269beab9c0ded0c0ce334e1f7003a..4881e39a01a8e39ab7a2794b4ca6322fc24f975a 100644 (file)
--- 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 c5a158a598869cd78dd298d87140f6b3f17472d7..e1565530cf84b59e77d7f51825f3ceb0c8322b1b 100644 (file)
--- 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,