Commit fc41e961 authored by Ross Schmidt's avatar Ross Schmidt Committed by Greg Kroah-Hartman
Browse files

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: default avatarRoss Schmidt <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201208040733.379197-16-ross.schm.dev@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 00f0b682

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/staging/rtl8723bs/include/wifi.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE