Commit 3f1f39fb authored by William Durand's avatar William Durand Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: rename bdRT2RTAggregation to bd_rt2rt_aggregation in bss_ht struct 



Rename bdRT2RTAggregation to bd_rt2rt_aggregation to silence a
checkpatch warning about CamelCase.

Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarWilliam Durand <will+git@drnd.me>
Link: https://lore.kernel.org/r/20210220172909.15812-10-will+git@drnd.me


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

drivers/staging/rtl8192e/rtl819x_HT.h

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ struct bss_ht { 
	enum ht_spec_ver bd_ht_spec_ver;

	enum ht_channel_width bd_bandwidth;



	u8					bdRT2RTAggregation;

	u8					bd_rt2rt_aggregation;

	u8					bdRT2RTLongSlotTime;

	u8					RT2RT_HT_Mode;

	u8					bdHT1R;

drivers/staging/rtl8192e/rtl819x_HTProc.c

+5 −5
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ bool IsHTHalfNmodeAPs(struct rtllib_device *ieee) 
		!memcmp(net->bssid, LINKSYSWRT350_LINKSYSWRT150_BROADCOM, 3) ||

		(net->broadcom_cap_exist))

		retValue = true;

	else if (net->bssht.bdRT2RTAggregation)

	else if (net->bssht.bd_rt2rt_aggregation)

		retValue = true;

	else

		retValue = false;
@@ -171,7 +171,7 @@ static void HTIOTPeerDetermine(struct rtllib_device *ieee) 
	struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;

	struct rtllib_network *net = &ieee->current_network;



	if (net->bssht.bdRT2RTAggregation) {

	if (net->bssht.bd_rt2rt_aggregation) {

		pHTInfo->IOTPeer = HT_IOT_PEER_REALTEK;

		if (net->bssht.RT2RT_HT_Mode & RT_HT_CAP_USE_92SE)

			pHTInfo->IOTPeer = HT_IOT_PEER_REALTEK_92SE;
@@ -591,7 +591,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) 
			pHTInfo->CurrentAMPDUFactor = pHTInfo->AMPDU_Factor;



	} else {

		if (ieee->current_network.bssht.bdRT2RTAggregation) {

		if (ieee->current_network.bssht.bd_rt2rt_aggregation) {

			if (ieee->pairwise_key_type != KEY_TYPE_NA)

				pHTInfo->CurrentAMPDUFactor =

						 pPeerHTCap->MaxRxAMPDUFactor;
@@ -697,7 +697,7 @@ void HTInitializeBssDesc(struct bss_ht *pBssHT) 


	pBssHT->bd_ht_spec_ver = HT_SPEC_VER_IEEE;



	pBssHT->bdRT2RTAggregation = false;

	pBssHT->bd_rt2rt_aggregation = false;

	pBssHT->bdRT2RTLongSlotTime = false;

	pBssHT->RT2RT_HT_Mode = (enum rt_ht_capability)0;

}
@@ -731,7 +731,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee, 


		if (pHTInfo->bRegRT2RTAggregation) {

			pHTInfo->bCurrentRT2RTAggregation =

				 pNetwork->bssht.bdRT2RTAggregation;

				 pNetwork->bssht.bd_rt2rt_aggregation;

			pHTInfo->bCurrentRT2RTLongSlotTime =

				 pNetwork->bssht.bdRT2RTLongSlotTime;

			pHTInfo->RT2RT_HT_Mode = pNetwork->bssht.RT2RT_HT_Mode;

drivers/staging/rtl8192e/rtllib_rx.c

+3 −3
Original line number Diff line number Diff line
@@ -1900,7 +1900,7 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee, 
		}

		if (ht_realtek_agg_len >= 5) {

			network->realtek_cap_exit = true;

			network->bssht.bdRT2RTAggregation = true;

			network->bssht.bd_rt2rt_aggregation = true;



			if ((ht_realtek_agg_buf[4] == 1) &&

			    (ht_realtek_agg_buf[5] & 0x02))
@@ -2291,7 +2291,7 @@ int rtllib_parse_info_param(struct rtllib_device *ieee, 


	if (!network->atheros_cap_exist && !network->broadcom_cap_exist &&

	    !network->cisco_cap_exist && !network->ralink_cap_exist &&

	    !network->bssht.bdRT2RTAggregation)

	    !network->bssht.bd_rt2rt_aggregation)

		network->unknown_cap_exist = true;

	else

		network->unknown_cap_exist = false;
@@ -2459,7 +2459,7 @@ static inline void update_network(struct rtllib_device *ieee, 
	memcpy(&dst->tim, &src->tim, sizeof(struct rtllib_tim_parameters));



	dst->bssht.bd_support_ht = src->bssht.bd_support_ht;

	dst->bssht.bdRT2RTAggregation = src->bssht.bdRT2RTAggregation;

	dst->bssht.bd_rt2rt_aggregation = src->bssht.bd_rt2rt_aggregation;

	dst->bssht.bd_ht_cap_len = src->bssht.bd_ht_cap_len;

	memcpy(dst->bssht.bd_ht_cap_buf, src->bssht.bd_ht_cap_buf,

	       src->bssht.bd_ht_cap_len);