Parcourir la source

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.
Jouni Malinen il y a 15 ans
Parent
commit
6fe8296197
2 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. 2 0
      src/common/ieee802_11_defs.h
  2. 0 2
      src/drivers/driver.h

+ 2 - 0
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

+ 0 - 2
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,