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

staging: rtl8723bs: replace rtw_ieee80211_ht_cap 



Replace the unique rtw_ieee80211_ht_cap struct with the provided standard
ieee80211_ht_cap.

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


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

drivers/staging/rtl8723bs/core/rtw_ap.c

+3 −3
Original line number Diff line number Diff line
@@ -1179,7 +1179,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	if (p && ie_len > 0) {

		u8 rf_type = 0;

		u8 max_rx_ampdu_factor = 0;

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

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



		pHT_caps_ie = p;
@@ -1225,8 +1225,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 


		rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));

		if (rf_type == RF_1T1R) {

			pht_cap->supp_mcs_set[0] = 0xff;

			pht_cap->supp_mcs_set[1] = 0x0;

			pht_cap->mcs.rx_mask[0] = 0xff;

			pht_cap->mcs.rx_mask[1] = 0x0;

		}



		memcpy(&pmlmepriv->htpriv.ht_cap, p + 2, ie_len);

drivers/staging/rtl8723bs/core/rtw_ioctl_set.c

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) 
			rf_type,

			((psta->bw_mode == CHANNEL_WIDTH_40)?1:0),

			short_GI,

			psta->htpriv.ht_cap.supp_mcs_set

			psta->htpriv.ht_cap.mcs.rx_mask

		);

	} else {

		while ((pcur_bss->SupportedRates[i] != 0) && (pcur_bss->SupportedRates[i] != 0xFF)) {

drivers/staging/rtl8723bs/core/rtw_mlme.c

+10 −10
Original line number Diff line number Diff line
@@ -2582,7 +2582,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ 
	u32 ielen, out_len;

	enum HT_CAP_AMPDU_FACTOR max_rx_ampdu_factor;

	unsigned char *p, *pframe;

	struct rtw_ieee80211_ht_cap ht_capie;

	struct ieee80211_ht_cap ht_capie;

	u8 cbw40_enable = 0, stbc_rx_enable = 0, rf_type = 0, operation_bw = 0;

	struct registry_priv *pregistrypriv = &padapter->registrypriv;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -2593,7 +2593,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ 


	out_len = *pout_len;



	memset(&ht_capie, 0, sizeof(struct rtw_ieee80211_ht_cap));

	memset(&ht_capie, 0, sizeof(struct ieee80211_ht_cap));



	ht_capie.cap_info = cpu_to_le16(IEEE80211_HT_CAP_DSSSCCK40);
@@ -2660,7 +2660,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ 
	}



	/* fill default supported_mcs_set */

	memcpy(ht_capie.supp_mcs_set, pmlmeext->default_supported_mcs_set, 16);

	memcpy(ht_capie.mcs.rx_mask, pmlmeext->default_supported_mcs_set, 16);



	/* update default supported_mcs_set */

	rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));
@@ -2670,7 +2670,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ 
		if (stbc_rx_enable)

			ht_capie.cap_info |= cpu_to_le16(IEEE80211_HT_CAP_RX_STBC_1R);/* RX STBC One spatial stream */



		set_mcs_rate_by_mask(ht_capie.supp_mcs_set, MCS_RATE_1R);

		set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_1R);

		break;



	case RF_2T2R:
@@ -2681,11 +2681,11 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ 


		#ifdef CONFIG_DISABLE_MCS13TO15

		if (((cbw40_enable == 1) && (operation_bw == CHANNEL_WIDTH_40)) && (pregistrypriv->wifi_spec != 1))

				set_mcs_rate_by_mask(ht_capie.supp_mcs_set, MCS_RATE_2R_13TO15_OFF);

				set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_2R_13TO15_OFF);

		else

				set_mcs_rate_by_mask(ht_capie.supp_mcs_set, MCS_RATE_2R);

				set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_2R);

		#else /* CONFIG_DISABLE_MCS13TO15 */

			set_mcs_rate_by_mask(ht_capie.supp_mcs_set, MCS_RATE_2R);

			set_mcs_rate_by_mask(ht_capie.mcs.rx_mask, MCS_RATE_2R);

		#endif /* CONFIG_DISABLE_MCS13TO15 */

		break;

	}
@@ -2712,7 +2712,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ 
		ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&0x00);



	pframe = rtw_set_ie(out_ie+out_len, _HT_CAPABILITY_IE_,

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

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



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

	int len;

	/* struct sta_info *bmc_sta, *psta; */

	struct rtw_ieee80211_ht_cap *pht_capie;

	struct ieee80211_ht_cap *pht_capie;

	struct ieee80211_ht_addt_info *pht_addtinfo;

	/* struct recv_reorder_ctrl *preorder_ctrl; */

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -2763,7 +2763,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_CAPABILITY_IE_, &len, ie_len-sizeof(struct ndis_802_11_fix_ie));

	if (p && len > 0) {

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

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

		max_ampdu_sz = (pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_FACTOR);

		max_ampdu_sz = 1 << (max_ampdu_sz+3); /*  max_ampdu_sz (kbytes); */

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+4 −4
Original line number Diff line number Diff line
@@ -1494,13 +1494,13 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) 
	}



	/* save HT capabilities in the sta object */

	memset(&pstat->htpriv.ht_cap, 0, sizeof(struct rtw_ieee80211_ht_cap));

	if (elems.ht_capabilities && elems.ht_capabilities_len >= sizeof(struct rtw_ieee80211_ht_cap)) {

	memset(&pstat->htpriv.ht_cap, 0, sizeof(struct ieee80211_ht_cap));

	if (elems.ht_capabilities && elems.ht_capabilities_len >= sizeof(struct ieee80211_ht_cap)) {

		pstat->flags |= WLAN_STA_HT;



		pstat->flags |= WLAN_STA_WME;



		memcpy(&pstat->htpriv.ht_cap, elems.ht_capabilities, sizeof(struct rtw_ieee80211_ht_cap));

		memcpy(&pstat->htpriv.ht_cap, elems.ht_capabilities, sizeof(struct ieee80211_ht_cap));



	} else

		pstat->flags &= ~WLAN_STA_HT;
@@ -5348,7 +5348,7 @@ void update_sta_info(struct adapter *padapter, struct sta_info *psta) 
		psta->htpriv.stbc_cap = pmlmepriv->htpriv.stbc_cap;

		psta->htpriv.beamform_cap = pmlmepriv->htpriv.beamform_cap;



		memcpy(&psta->htpriv.ht_cap, &pmlmeinfo->HT_caps, sizeof(struct rtw_ieee80211_ht_cap));

		memcpy(&psta->htpriv.ht_cap, &pmlmeinfo->HT_caps, sizeof(struct ieee80211_ht_cap));

	} else {

		psta->htpriv.ht_option = false;

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

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

	u8 *pbssid = GetAddr3Ptr(pframe);

	struct HT_info_element *pht_info = NULL;

	struct rtw_ieee80211_ht_cap *pht_cap = NULL;

	struct ieee80211_ht_cap *pht_cap = NULL;

	u32 bcn_channel;

	unsigned short	ht_cap_info;

	unsigned char ht_info_infos_0;
@@ -1282,7 +1282,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) 
	/* parsing HT_CAP_IE */

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

	if (p && len > 0) {

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

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

			ht_cap_info = le16_to_cpu(pht_cap->cap_info);

	} else {

			ht_cap_info = 0;