From: Ross Schmidt Date: Tue, 8 Dec 2020 04:07:27 +0000 (-0600) Subject: staging: rtl8723bs: replace _WAPI_IE_ X-Git-Tag: v5.11-rc1~163^2~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc41e9618fc65bea5d615d487ca7de3b0e1110bc;p=thirdparty%2Fkernel%2Flinux.git staging: rtl8723bs: replace _WAPI_IE_ Replace unique _WAPI_IE_ macro with kernel provided WLAN_EID_BSS_AC_ACCESS_DELAY from linux/ieee80211.h. Signed-off-by: Ross Schmidt Link: https://lore.kernel.org/r/20201208040733.379197-16-ross.schm.dev@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c index 28d5892d8bda2..be4cffce4f5d6 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c +++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c @@ -623,8 +623,8 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len) while (cnt < in_len) { authmode = in_ie[cnt]; - /* if (authmode == _WAPI_IE_) */ - if (authmode == _WAPI_IE_ && (!memcmp(&in_ie[cnt+6], wapi_oui1, 4) || + /* if (authmode == WLAN_EID_BSS_AC_ACCESS_DELAY) */ + if (authmode == WLAN_EID_BSS_AC_ACCESS_DELAY && (!memcmp(&in_ie[cnt+6], wapi_oui1, 4) || !memcmp(&in_ie[cnt+6], wapi_oui2, 4))) { if (wapi_ie) { memcpy(wapi_ie, &in_ie[cnt], in_ie[cnt+1]+2); diff --git a/drivers/staging/rtl8723bs/include/wifi.h b/drivers/staging/rtl8723bs/include/wifi.h index e221d4574f32a..29621fce6a832 100644 --- a/drivers/staging/rtl8723bs/include/wifi.h +++ b/drivers/staging/rtl8723bs/include/wifi.h @@ -393,7 +393,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe) #define _FTIE_ 55 #define _TIMEOUT_ITVL_IE_ 56 #define _SRC_IE_ 59 -#define _WAPI_IE_ 68 #define _RIC_Descriptor_IE_ 75 #define _MME_IE_ 76 /* 802.11w Management MIC element */