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

staging: rtl8723bs: replace _DSSET_IE_ 



Replace unique _DSSET_IE_ macro with kernel provdied WLAN_EID_DS_PARAMS
from linux/ieee80211.h.

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


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

drivers/staging/rtl8723bs/core/rtw_ap.c

+1 −1
Original line number Diff line number Diff line
@@ -1019,7 +1019,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	pbss_network->Configuration.Length = 0;

	p = rtw_get_ie(

		ie + _BEACON_IE_OFFSET_,

		_DSSET_IE_, &ie_len,

		WLAN_EID_DS_PARAMS, &ie_len,

		(pbss_network->IELength - _BEACON_IE_OFFSET_)

	);

	if (p && ie_len > 0)

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

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



	/* DS parameter set */

	ie = rtw_set_ie(ie, _DSSET_IE_, 1, (u8 *)&(pdev_network->Configuration.DSConfig), &sz);

	ie = rtw_set_ie(ie, WLAN_EID_DS_PARAMS, 1, (u8 *)&(pdev_network->Configuration.DSConfig), &sz);



	/* IBSS Parameter Set */

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+5 −5
Original line number Diff line number Diff line
@@ -2543,7 +2543,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) 
	pframe = rtw_set_ie(pframe, WLAN_EID_SUPP_RATES, ((rate_len > 8) ? 8 : rate_len), cur_network->SupportedRates, &pattrib->pktlen);



	/*  DS parameter set */

	pframe = rtw_set_ie(pframe, _DSSET_IE_, 1, (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen);

	pframe = rtw_set_ie(pframe, WLAN_EID_DS_PARAMS, 1, (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen);



	/* if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) */

	{
@@ -2747,7 +2747,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p 
		pframe = rtw_set_ie(pframe, WLAN_EID_SUPP_RATES, ((rate_len > 8) ? 8 : rate_len), cur_network->SupportedRates, &pattrib->pktlen);



		/*  DS parameter set */

		pframe = rtw_set_ie(pframe, _DSSET_IE_, 1, (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen);

		pframe = rtw_set_ie(pframe, WLAN_EID_DS_PARAMS, 1, (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen);



		if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) {

			u8 erpinfo = 0;
@@ -2884,7 +2884,7 @@ static int _issue_probereq(struct adapter *padapter, 
	}



	if (ch)

		pframe = rtw_set_ie(pframe, _DSSET_IE_, 1, &ch, &pattrib->pktlen);

		pframe = rtw_set_ie(pframe, WLAN_EID_DS_PARAMS, 1, &ch, &pattrib->pktlen);



	if (append_wps) {

		/* add wps_ie for wps2.0 */
@@ -4509,7 +4509,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str 
		return _FAIL;



	/*  Checking for DSConfig */

	p = rtw_get_ie(bssid->IEs + ie_offset, _DSSET_IE_, &len, bssid->IELength - ie_offset);

	p = rtw_get_ie(bssid->IEs + ie_offset, WLAN_EID_DS_PARAMS, &len, bssid->IELength - ie_offset);



	bssid->Configuration.DSConfig = 0;

	bssid->Configuration.Length = 0;
@@ -5982,7 +5982,7 @@ static int rtw_auto_ap_start_beacon(struct adapter *adapter) 
	} else {

		oper_channel = adapter_to_dvobj(adapter)->oper_channel;

	}

	ie = rtw_set_ie(ie, _DSSET_IE_, 1, &oper_channel, &sz);

	ie = rtw_set_ie(ie, WLAN_EID_DS_PARAMS, 1, &oper_channel, &sz);



	/* ext supported rates */

	if (rateLen > 8) {

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

+1 −1
Original line number Diff line number Diff line
@@ -1321,7 +1321,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) 
	}



	/* Checking for channel */

	p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _DSSET_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_);

	p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, WLAN_EID_DS_PARAMS, &len, bssid->IELength - _FIXED_IE_LENGTH_);

	if (p) {

			bcn_channel = *(p + 2);

	} else {/* In 5G, some ap do not have DSSET IE checking HT info for channel */

drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength) 
	pframe = rtw_set_ie(pframe, WLAN_EID_SUPP_RATES, ((rate_len > 8) ? 8 : rate_len), cur_network->SupportedRates, &pktlen);



	/*  DS parameter set */

	pframe = rtw_set_ie(pframe, _DSSET_IE_, 1, (unsigned char *)&(cur_network->Configuration.DSConfig), &pktlen);

	pframe = rtw_set_ie(pframe, WLAN_EID_DS_PARAMS, 1, (unsigned char *)&(cur_network->Configuration.DSConfig), &pktlen);



	if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) {

		u32 ATIMWindow;