Commit be13eda5 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Rename SelfMimoPs, CurrentOpMode and bForcedShortGI 



Rename variable SelfMimoPs to self_mimo_ps, CurrentOpMode to
current_op_mode and bForcedShortGI to forced_short_gi to avoid CamelCase
which is not accepted by checkpatch.

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/4c59f62a95b9a77711284998b98fbc559b8db813.1664055213.git.philipp.g.hortmann@gmail.com


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

drivers/staging/rtl8192e/rtl819x_HT.h

+3 −3
Original line number Diff line number Diff line
@@ -140,11 +140,11 @@ struct rt_hi_throughput { 
	enum ht_aggre_mode ForcedAMSDUMode;

	u16				ForcedAMSDUMaxSize;



	u8				bForcedShortGI;

	u8 forced_short_gi;



	u8				CurrentOpMode;

	u8 current_op_mode;



	u8				SelfMimoPs;

	u8 self_mimo_ps;

	u8 peer_mimo_ps;



	enum ht_extchnl_offset CurSTAExtChnlOffset;

drivers/staging/rtl8192e/rtl819x_HTProc.c

+8 −8
Original line number Diff line number Diff line
@@ -90,9 +90,9 @@ void HTUpdateDefaultSetting(struct rtllib_device *ieee) 
	pHTInfo->AMPDU_Factor = 2;

	pHTInfo->MPDU_Density = 0;



	pHTInfo->SelfMimoPs = 3;

	if (pHTInfo->SelfMimoPs == 2)

		pHTInfo->SelfMimoPs = 3;

	pHTInfo->self_mimo_ps = 3;

	if (pHTInfo->self_mimo_ps == 2)

		pHTInfo->self_mimo_ps = 3;

	ieee->bTxDisableRateFallBack = 0;

	ieee->bTxUseDriverAssingedRate = 0;
@@ -300,7 +300,7 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap, 
	else

		pCapELE->ChlWidth = (pHT->bRegBW40MHz ? 1 : 0);



	pCapELE->MimoPwrSave		= pHT->SelfMimoPs;

	pCapELE->MimoPwrSave		= pHT->self_mimo_ps;

	pCapELE->GreenField		= 0;

	pCapELE->ShortGI20Mhz		= 1;

	pCapELE->ShortGI40Mhz		= 1;
@@ -377,7 +377,7 @@ void HTConstructInfoElement(struct rtllib_device *ieee, u8 *posHTInfo, 
		pHTInfoEle->RIFS			= 0;

		pHTInfoEle->PSMPAccessOnly		= 0;

		pHTInfoEle->SrvIntGranularity		= 0;

		pHTInfoEle->OptMode			= pHT->CurrentOpMode;

		pHTInfoEle->OptMode			= pHT->current_op_mode;

		pHTInfoEle->NonGFDevPresent		= 0;

		pHTInfoEle->DualBeacon			= 0;

		pHTInfoEle->SecondaryBeacon		= 0;
@@ -623,7 +623,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) 
				   ieee->dot11HTOperationalRateSet, pMcsFilter);

	ieee->HTCurrentOperaRate = ieee->HTHighestOperaRate;



	pHTInfo->CurrentOpMode = pPeerHTInfo->OptMode;

	pHTInfo->current_op_mode = pPeerHTInfo->OptMode;

}



void HTInitializeHTInfo(struct rtllib_device *ieee)
@@ -637,7 +637,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) 


	pHTInfo->bCurShortGI20MHz = false;

	pHTInfo->bCurShortGI40MHz = false;

	pHTInfo->bForcedShortGI = false;

	pHTInfo->forced_short_gi = false;



	pHTInfo->bCurSuppCCK = true;
@@ -774,7 +774,7 @@ void HT_update_self_and_peer_setting(struct rtllib_device *ieee, 


	if (pHTInfo->bCurrentHTSupport) {

		if (pNetwork->bssht.bd_ht_info_len != 0)

			pHTInfo->CurrentOpMode = pPeerHTInfo->OptMode;

			pHTInfo->current_op_mode = pPeerHTInfo->OptMode;

	}

}

EXPORT_SYMBOL(HT_update_self_and_peer_setting);

drivers/staging/rtl8192e/rtllib_tx.c

+2 −2
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static void rtllib_query_HTCapShortGI(struct rtllib_device *ieee, 
	if (!pHTInfo->bCurrentHTSupport || !pHTInfo->bEnableHT)

		return;



	if (pHTInfo->bForcedShortGI) {

	if (pHTInfo->forced_short_gi) {

		tcb_desc->bUseShortGI = true;

		return;

	}
@@ -440,7 +440,7 @@ static void rtllib_query_protectionmode(struct rtllib_device *ieee, 
			break;

		}

		if (pHTInfo->bCurrentHTSupport  && pHTInfo->bEnableHT) {

			u8 HTOpMode = pHTInfo->CurrentOpMode;

			u8 HTOpMode = pHTInfo->current_op_mode;



			if ((pHTInfo->bCurBW40MHz && (HTOpMode == 2 ||

			     HTOpMode == 3)) ||