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

staging: rtl8723bs: use WLAN_EID_HT_OPERATION 



Replace unique _HT_EXTRA_INFO_IE_ and _HT_ADD_INFO_IE_ macros with kernel
provided WLAN_EID_HT_OPERATION from linux/ieee80211.h.

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


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

drivers/staging/rtl8723bs/core/rtw_ap.c

+5 −5
Original line number Diff line number Diff line
@@ -855,7 +855,7 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf) 
	/* set channel, bwmode */

	p = rtw_get_ie(

		(pnetwork->IEs + sizeof(struct ndis_802_11_fix_ie)),

		_HT_ADD_INFO_IE_,

		WLAN_EID_HT_OPERATION,

		&ie_len,

		(pnetwork->IELength - sizeof(struct ndis_802_11_fix_ie))

	);
@@ -1235,7 +1235,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	/* parsing HT_INFO_IE */

	p = rtw_get_ie(

		ie + _BEACON_IE_OFFSET_,

		_HT_ADD_INFO_IE_,

		WLAN_EID_HT_OPERATION,

		&ie_len,

		(pbss_network->IELength - _BEACON_IE_OFFSET_)

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


		break;



	case _HT_ADD_INFO_IE_:

	case WLAN_EID_HT_OPERATION:



		update_bcn_htinfo_ie(padapter);
@@ -2053,7 +2053,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, WLAN_EID_HT_CAPABILITY, NULL, false);

		update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, true);

		update_beacon(padapter, WLAN_EID_HT_OPERATION, NULL, true);

	}



	/* update associated stations cap. */
@@ -2117,7 +2117,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, WLAN_EID_HT_CAPABILITY, NULL, false);

		update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, true);

		update_beacon(padapter, WLAN_EID_HT_OPERATION, NULL, true);

	}



	/* update associated stations cap. */

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

+1 −1
Original line number Diff line number Diff line
@@ -1217,7 +1217,7 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork) 
			pnetwork->BcnInfo.ht_cap_info = 0;

	}

	/* parsing HT_INFO_IE */

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

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

	if (p && len > 0) {

			pht_info = (struct HT_info_element *)(p + 2);

			pnetwork->BcnInfo.ht_info_infos_0 = pht_info->infos[0];

drivers/staging/rtl8723bs/core/rtw_mlme.c

+4 −4
Original line number Diff line number Diff line
@@ -2616,7 +2616,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ 
			/* TDLS: TODO 40? */

			operation_bw = CHANNEL_WIDTH_40;

	} else {

		p = rtw_get_ie(in_ie, _HT_ADD_INFO_IE_, &ielen, in_len);

		p = rtw_get_ie(in_ie, WLAN_EID_HT_OPERATION, &ielen, in_len);

		if (p && (ielen == sizeof(struct ieee80211_ht_addt_info))) {

			struct HT_info_element *pht_info = (struct HT_info_element *)(p+2);
@@ -2724,10 +2724,10 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ 
	phtpriv->ht_option = true;



	if (in_ie) {

		p = rtw_get_ie(in_ie, _HT_ADD_INFO_IE_, &ielen, in_len);

		p = rtw_get_ie(in_ie, WLAN_EID_HT_OPERATION, &ielen, in_len);

		if (p && (ielen == sizeof(struct ieee80211_ht_addt_info))) {

			out_len = *pout_len;

			pframe = rtw_set_ie(out_ie+out_len, _HT_ADD_INFO_IE_, ielen, p+2, pout_len);

			pframe = rtw_set_ie(out_ie+out_len, WLAN_EID_HT_OPERATION, ielen, p+2, pout_len);

		}

	}
@@ -2780,7 +2780,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe 
	}



	len = 0;

	p = rtw_get_ie(pie+sizeof(struct ndis_802_11_fix_ie), _HT_ADD_INFO_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_OPERATION, &len, ie_len-sizeof(struct ndis_802_11_fix_ie));

	if (p && len > 0) {

		pht_addtinfo = (struct ieee80211_ht_addt_info *)(p+2);

		/* todo: */

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

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

			break;



		case _HT_EXTRA_INFO_IE_:	/* HT info */

		case WLAN_EID_HT_OPERATION:	/* HT info */

			HT_info_handler(padapter, pIE);

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


		/* FILL HT ADD INFO IE */

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

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

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

		if (pbuf && ie_len > 0) {

			memcpy(pframe, pbuf, ie_len+2);

			pframe += (ie_len+2);
@@ -4519,7 +4519,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str 
	} else {

		/*  In 5G, some ap do not have DSSET IE */

		/*  checking HT info for channel */

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

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

		if (p) {

			struct HT_info_element *HT_info = (struct HT_info_element *)(p + 2);
@@ -6182,7 +6182,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) 
			pmlmeinfo->HT_caps_enable = 1;

			break;



		case _HT_EXTRA_INFO_IE_:	/* Get HT Info IE. */

		case WLAN_EID_HT_OPERATION:	/* Get HT Info IE. */

			pmlmeinfo->HT_info_enable = 1;



			/* spec case only for cisco's ap because cisco's ap issue assoc rsp using mcs rate @40MHz or @20MHz */

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

+3 −3
Original line number Diff line number Diff line
@@ -1297,7 +1297,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) 
			ht_cap_info = 0;

	}

	/* parsing HT_INFO_IE */

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

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

	if (p && len > 0) {

			pht_info = (struct HT_info_element *)(p + 2);

			ht_info_infos_0 = pht_info->infos[0];
@@ -1325,7 +1325,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) 
	if (p) {

			bcn_channel = *(p + 2);

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

			rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _HT_ADD_INFO_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_);

			rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, WLAN_EID_HT_OPERATION, &len, bssid->IELength - _FIXED_IE_LENGTH_);

			if (pht_info) {

					bcn_channel = pht_info->primary_channel;

			} else { /* we don't find channel IE, so don't check it */
@@ -1474,7 +1474,7 @@ void update_beacon_info(struct adapter *padapter, u8 *pframe, uint pkt_len, stru 


			break;



		case _HT_EXTRA_INFO_IE_:	/* HT info */

		case WLAN_EID_HT_OPERATION:	/* HT info */

			/* HT_info_handler(padapter, pIE); */

			bwmode_update_check(padapter, pIE);

			break;