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

staging: rtl8723bs: use WLAN_EID_HT_CAPABILITY 



Replace unique WLAN_EID_HT_CAP, _HT_CAPABILITY_IE_, and EID_HTCapability
with kernel provided WLAN_EID_HT_CAPABILITY from linux/ieee80211.h.

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


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

drivers/staging/rtl8723bs/core/rtw_ap.c

+4 −4
Original line number Diff line number Diff line
@@ -1172,7 +1172,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	/* parsing HT_CAP_IE */

	p = rtw_get_ie(

		ie + _BEACON_IE_OFFSET_,

		_HT_CAPABILITY_IE_,

		WLAN_EID_HT_CAPABILITY,

		&ie_len,

		(pbss_network->IELength - _BEACON_IE_OFFSET_)

	);
@@ -1774,7 +1774,7 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx) 


		break;



	case _HT_CAPABILITY_IE_:

	case WLAN_EID_HT_CAPABILITY:



		update_bcn_htcap_ie(padapter);
@@ -2052,7 +2052,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) 
	}



	if (rtw_ht_operation_update(padapter) > 0) {

		update_beacon(padapter, _HT_CAPABILITY_IE_, NULL, false);

		update_beacon(padapter, WLAN_EID_HT_CAPABILITY, NULL, false);

		update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, true);

	}
@@ -2116,7 +2116,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) 
	}



	if (rtw_ht_operation_update(padapter) > 0) {

		update_beacon(padapter, _HT_CAPABILITY_IE_, NULL, false);

		update_beacon(padapter, WLAN_EID_HT_CAPABILITY, NULL, false);

		update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, true);

	}

drivers/staging/rtl8723bs/core/rtw_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) 
	}



	phtpriv->ht_option = false;

	ptmp = rtw_get_ie(&pnetwork->network.IEs[12], _HT_CAPABILITY_IE_, &tmp_len, pnetwork->network.IELength-12);

	ptmp = rtw_get_ie(&pnetwork->network.IEs[12], WLAN_EID_HT_CAPABILITY, &tmp_len, pnetwork->network.IELength-12);

	if (pregistrypriv->ht_enable && ptmp && tmp_len > 0) {

		/* 	Added by Albert 2010/06/23 */

		/* 	For the WEP mode, we will use the bg mode to do the connection to avoid some IOT issue. */

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

+2 −2
Original line number Diff line number Diff line
@@ -1056,7 +1056,7 @@ ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len, 
			elems->timeout_int = pos;

			elems->timeout_int_len = elen;

			break;

		case WLAN_EID_HT_CAP:

		case WLAN_EID_HT_CAPABILITY:

			elems->ht_capabilities = pos;

			elems->ht_capabilities_len = elen;

			break;
@@ -1209,7 +1209,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork) 


	/* get bwmode and ch_offset */

	/* parsing HT_CAP_IE */

	p = rtw_get_ie(pnetwork->network.IEs + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_, &len, pnetwork->network.IELength - _FIXED_IE_LENGTH_);

	p = rtw_get_ie(pnetwork->network.IEs + _FIXED_IE_LENGTH_, WLAN_EID_HT_CAPABILITY, &len, pnetwork->network.IELength - _FIXED_IE_LENGTH_);

	if (p && len > 0) {

			pht_cap = (struct ieee80211_ht_cap *)(p + 2);

			pnetwork->BcnInfo.ht_cap_info = le16_to_cpu(pht_cap->cap_info);

drivers/staging/rtl8723bs/core/rtw_mlme.c

+2 −2
Original line number Diff line number Diff line
@@ -2718,7 +2718,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ 
	else

		ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&0x00);



	pframe = rtw_set_ie(out_ie+out_len, _HT_CAPABILITY_IE_,

	pframe = rtw_set_ie(out_ie+out_len, WLAN_EID_HT_CAPABILITY,

						sizeof(struct ieee80211_ht_cap), (unsigned char *)&ht_capie, pout_len);



	phtpriv->ht_option = true;
@@ -2768,7 +2768,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe 


	/* check Max Rx A-MPDU Size */

	len = 0;

	p = rtw_get_ie(pie+sizeof(struct ndis_802_11_fix_ie), _HT_CAPABILITY_IE_, &len, ie_len-sizeof(struct ndis_802_11_fix_ie));

	p = rtw_get_ie(pie+sizeof(struct ndis_802_11_fix_ie), WLAN_EID_HT_CAPABILITY, &len, ie_len-sizeof(struct ndis_802_11_fix_ie));

	if (p && len > 0) {

		pht_capie = (struct ieee80211_ht_cap *)(p+2);

		max_ampdu_sz = (pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_FACTOR);

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+7 −7
Original line number Diff line number Diff line
@@ -1697,7 +1697,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame) 
				WMM_param_handler(padapter, pIE);

			break;



		case _HT_CAPABILITY_IE_:	/* HT caps */

		case WLAN_EID_HT_CAPABILITY:	/* HT caps */

			HT_caps_handler(padapter, pIE);

			break;
@@ -3164,7 +3164,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i 


		/* FILL HT CAP INFO IE */

		/* p = hostapd_eid_ht_capabilities_info(hapd, p); */

		pbuf = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _HT_CAPABILITY_IE_, &ie_len, (pnetwork->IELength - _BEACON_IE_OFFSET_));

		pbuf = rtw_get_ie(ie + _BEACON_IE_OFFSET_, WLAN_EID_HT_CAPABILITY, &ie_len, (pnetwork->IELength - _BEACON_IE_OFFSET_));

		if (pbuf && ie_len > 0) {

			memcpy(pframe, pbuf, ie_len+2);

			pframe += (ie_len+2);
@@ -3372,11 +3372,11 @@ void issue_assocreq(struct adapter *padapter) 
		case EID_WPA2:

			pframe = rtw_set_ie(pframe, EID_WPA2, pIE->Length, pIE->data, &(pattrib->pktlen));

			break;

		case EID_HTCapability:

		case WLAN_EID_HT_CAPABILITY:

			if (padapter->mlmepriv.htpriv.ht_option) {

				if (!(is_ap_in_tkip(padapter))) {

					memcpy(&(pmlmeinfo->HT_caps), pIE->data, sizeof(struct HT_caps_element));

					pframe = rtw_set_ie(pframe, EID_HTCapability, pIE->Length, (u8 *)(&(pmlmeinfo->HT_caps)), &(pattrib->pktlen));

					pframe = rtw_set_ie(pframe, WLAN_EID_HT_CAPABILITY, pIE->Length, (u8 *)(&(pmlmeinfo->HT_caps)), &(pattrib->pktlen));

				}

			}

			break;
@@ -4125,7 +4125,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) 


			pbss_network = (struct wlan_bssid_ex *)&pnetwork->network;



			p = rtw_get_ie(pbss_network->IEs + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_, &len, pbss_network->IELength - _FIXED_IE_LENGTH_);

			p = rtw_get_ie(pbss_network->IEs + _FIXED_IE_LENGTH_, WLAN_EID_HT_CAPABILITY, &len, pbss_network->IELength - _FIXED_IE_LENGTH_);

			if ((p == NULL) || (len == 0)) {/* non-HT */



				if ((pbss_network->Configuration.DSConfig <= 0) || (pbss_network->Configuration.DSConfig > 14))
@@ -4553,7 +4553,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str 
	if ((pregistrypriv->wifi_spec == 1) && (false == pmlmeinfo->bwmode_updated)) {

		struct mlme_priv *pmlmepriv = &padapter->mlmepriv;



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

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

		if (p && len > 0) {

			struct HT_caps_element	*pHT_caps;
@@ -6178,7 +6178,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) 
				WMM_param_handler(padapter, pIE);

			break;



		case _HT_CAPABILITY_IE_:	/* Get HT Cap IE. */

		case WLAN_EID_HT_CAPABILITY:	/* Get HT Cap IE. */

			pmlmeinfo->HT_caps_enable = 1;

			break;