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 <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201208040733.379197-16-ross.schm.dev@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
index 28d5892d8bda26f0252dfae2f971d08145b42cc1..be4cffce4f5d693e923e06df59f36c404b314517 100644 (file)
--- 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 e221d4574f32a37ad78d63ec9fe4ddd6c06d3114..29621fce6a832b1efff8538694f913765af47a9d 100644 (file)
--- 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 */