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

staging: rtl8723bs: replace _COUNTRY_IE_ 



Replace unique _COUNTRY_IE_ macro with kernel provided WLAN_EID_COUNTRY
from linux/ieee80211.h.

Signed-off-by: default avatarRoss Schmidt <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201208040733.379197-12-ross.schm.dev@gmail.com


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

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+1 −1
Original line number Diff line number Diff line
@@ -4788,7 +4788,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid 
		u8 noc; /*  number of channel */

		u8 j, k;



		ie = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _COUNTRY_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_);

		ie = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, WLAN_EID_COUNTRY, &len, bssid->IELength - _FIXED_IE_LENGTH_);

		if (!ie)

			return;

		if (len < 6)

drivers/staging/rtl8723bs/include/wifi.h

+0 −1
Original line number Diff line number Diff line
@@ -387,7 +387,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe) 


#define _FIXED_IE_LENGTH_			_BEACON_IE_OFFSET_



#define _COUNTRY_IE_			7

#define _CHLGETXT_IE_			16

#define _SUPPORTED_CH_IE_		36

#define _CH_SWTICH_ANNOUNCE_	37	/* Secondary Channel Offset */

CRA Git | Maintained and supported by SUSTech CRA and CCSE