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

staging: rtl8723bs: replace _IBSS_PARA_IE_ 



Replace unique _IBSS_PARA_IE_ macro with kernel provided
WLAN_EID_IBSS_PARAMS from linux/ieee80211.h.

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


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

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv) 


	/* IBSS Parameter Set */



	ie = rtw_set_ie(ie, _IBSS_PARA_IE_, 2, (u8 *)&(pdev_network->Configuration.ATIMWindow), &sz);

	ie = rtw_set_ie(ie, WLAN_EID_IBSS_PARAMS, 2, (u8 *)&(pdev_network->Configuration.ATIMWindow), &sz);



	if (rateLen > 8) {

		ie = rtw_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8), (pdev_network->SupportedRates + 8), &sz);

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+2 −2
Original line number Diff line number Diff line
@@ -2552,7 +2552,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) 
		/*  IBSS Parameter Set... */

		/* ATIMWindow = cur->Configuration.ATIMWindow; */

		ATIMWindow = 0;

		pframe = rtw_set_ie(pframe, _IBSS_PARA_IE_, 2, (unsigned char *)(&ATIMWindow), &pattrib->pktlen);

		pframe = rtw_set_ie(pframe, WLAN_EID_IBSS_PARAMS, 2, (unsigned char *)(&ATIMWindow), &pattrib->pktlen);



		/* ERP IE */

		pframe = rtw_set_ie(pframe, _ERPINFO_IE_, 1, &erpinfo, &pattrib->pktlen);
@@ -2755,7 +2755,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p 
			/*  IBSS Parameter Set... */

			/* ATIMWindow = cur->Configuration.ATIMWindow; */

			ATIMWindow = 0;

			pframe = rtw_set_ie(pframe, _IBSS_PARA_IE_, 2, (unsigned char *)(&ATIMWindow), &pattrib->pktlen);

			pframe = rtw_set_ie(pframe, WLAN_EID_IBSS_PARAMS, 2, (unsigned char *)(&ATIMWindow), &pattrib->pktlen);



			/* ERP IE */

			pframe = rtw_set_ie(pframe, _ERPINFO_IE_, 1, &erpinfo, &pattrib->pktlen);

drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength) 
		/*  IBSS Parameter Set... */

		/* ATIMWindow = cur->Configuration.ATIMWindow; */

		ATIMWindow = 0;

		pframe = rtw_set_ie(pframe, _IBSS_PARA_IE_, 2, (unsigned char *)(&ATIMWindow), &pktlen);

		pframe = rtw_set_ie(pframe, WLAN_EID_IBSS_PARAMS, 2, (unsigned char *)(&ATIMWindow), &pktlen);

	}

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 _IBSS_PARA_IE_			6

#define _COUNTRY_IE_			7

#define _CHLGETXT_IE_			16

#define _SUPPORTED_CH_IE_		36

CRA Git | Maintained and supported by SUSTech CRA and CCSE