mirror of
https://github.com/Mange/rtl8192eu-linux-driver
synced 2024-11-22 05:25:03 +00:00
use the proper WLAN_OUI_TYPE_MICROSOFT_* definitions.
port 42282f4147e2bc5b89d6a050244a7c5475613d83
This commit is contained in:
parent
7a0d67040a
commit
04b4fa6f82
@ -1214,13 +1214,13 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
|
|||||||
/* Microsoft/Wi-Fi information elements are further typed and
|
/* Microsoft/Wi-Fi information elements are further typed and
|
||||||
* subtyped */
|
* subtyped */
|
||||||
switch (pos[3]) {
|
switch (pos[3]) {
|
||||||
case 1:
|
case WLAN_OUI_TYPE_MICROSOFT_WPA:
|
||||||
/* Microsoft OUI (00:50:F2) with OUI Type 1:
|
/* Microsoft OUI (00:50:F2) with OUI Type 1:
|
||||||
* real WPA information element */
|
* real WPA information element */
|
||||||
elems->wpa_ie = pos;
|
elems->wpa_ie = pos;
|
||||||
elems->wpa_ie_len = elen;
|
elems->wpa_ie_len = elen;
|
||||||
break;
|
break;
|
||||||
case WME_OUI_TYPE: /* this is a Wi-Fi WME info. element */
|
case WLAN_OUI_TYPE_MICROSOFT_WMM: /* this is a Wi-Fi WME info. element */
|
||||||
if (elen < 5) {
|
if (elen < 5) {
|
||||||
RTW_DBG("short WME "
|
RTW_DBG("short WME "
|
||||||
"information element ignored "
|
"information element ignored "
|
||||||
@ -1246,7 +1246,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 4:
|
case WLAN_OUI_TYPE_MICROSOFT_WPS:
|
||||||
/* Wi-Fi Protected Setup (WPS) IE */
|
/* Wi-Fi Protected Setup (WPS) IE */
|
||||||
elems->wps_ie = pos;
|
elems->wps_ie = pos;
|
||||||
elems->wps_ie_len = elen;
|
elems->wps_ie_len = elen;
|
||||||
|
@ -898,8 +898,6 @@ enum rtw_ieee80211_wnm_actioncode {
|
|||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define WME_OUI_TYPE 2
|
|
||||||
|
|
||||||
#define WME_OUI_SUBTYPE_INFORMATION_ELEMENT 0
|
#define WME_OUI_SUBTYPE_INFORMATION_ELEMENT 0
|
||||||
#define WME_OUI_SUBTYPE_PARAMETER_ELEMENT 1
|
#define WME_OUI_SUBTYPE_PARAMETER_ELEMENT 1
|
||||||
#define WME_OUI_SUBTYPE_TSPEC_ELEMENT 2
|
#define WME_OUI_SUBTYPE_TSPEC_ELEMENT 2
|
||||||
|
Loading…
Reference in New Issue
Block a user