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

staging: rtl8192e: Rename CurrentMPDU..., ForcedAMPDU... and ForcedMPDU... 



Rename variable CurrentMPDUDensity to current_mpdu_density,
ForcedAMPDUFactor to forced_ampdu_factor and ForcedMPDUDensity to
forced_mpdu_density 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/4fb37ad6dab9addccf99a41a861220840c123e9b.1664055213.git.philipp.g.hortmann@gmail.com


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

drivers/staging/rtl8192e/rtl819x_HT.h

+3 −3
Original line number Diff line number Diff line
@@ -131,11 +131,11 @@ struct rt_hi_throughput { 
	u8				AMPDU_Factor;

	u8				CurrentAMPDUFactor;

	u8				MPDU_Density;

	u8				CurrentMPDUDensity;

	u8 current_mpdu_density;



	enum ht_aggre_mode ForcedAMPDUMode;

	u8				ForcedAMPDUFactor;

	u8				ForcedMPDUDensity;

	u8 forced_ampdu_factor;

	u8 forced_mpdu_density;



	enum ht_aggre_mode ForcedAMSDUMode;

	u16				ForcedAMSDUMaxSize;

drivers/staging/rtl8192e/rtl819x_HTProc.c

+4 −4
Original line number Diff line number Diff line
@@ -597,9 +597,9 @@ void HTOnAssocRsp(struct rtllib_device *ieee) 
		}

	}

	if (pHTInfo->MPDU_Density > pPeerHTCap->MPDUDensity)

		pHTInfo->CurrentMPDUDensity = pHTInfo->MPDU_Density;

		pHTInfo->current_mpdu_density = pHTInfo->MPDU_Density;

	else

		pHTInfo->CurrentMPDUDensity = pPeerHTCap->MPDUDensity;

		pHTInfo->current_mpdu_density = pPeerHTCap->MPDUDensity;

	if (pHTInfo->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K) {

		pHTInfo->bCurrentAMPDUEnable = false;

		pHTInfo->ForcedAMSDUMode = HT_AGG_FORCE_ENABLE;
@@ -643,7 +643,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) 


	pHTInfo->bCurrent_AMSDU_Support = false;

	pHTInfo->nCurrent_AMSDU_MaxSize = pHTInfo->nAMSDU_MaxSize;

	pHTInfo->CurrentMPDUDensity = pHTInfo->MPDU_Density;

	pHTInfo->current_mpdu_density = pHTInfo->MPDU_Density;

	pHTInfo->CurrentAMPDUFactor = pHTInfo->AMPDU_Factor;



	memset((void *)(&(pHTInfo->SelfHTCap)), 0,
@@ -801,7 +801,7 @@ void HTUseDefaultSetting(struct rtllib_device *ieee) 
		pHTInfo->bCurrentAMPDUEnable = pHTInfo->bAMPDUEnable;

		pHTInfo->CurrentAMPDUFactor = pHTInfo->AMPDU_Factor;



		pHTInfo->CurrentMPDUDensity = pHTInfo->CurrentMPDUDensity;

		pHTInfo->current_mpdu_density = pHTInfo->current_mpdu_density;



		HTFilterMCSRate(ieee, ieee->Regdot11TxHTOperationalRateSet,

				ieee->dot11HTOperationalRateSet);

drivers/staging/rtl8192e/rtllib_tx.c

+3 −3
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee, 
		if (ieee->iw_mode == IW_MODE_INFRA) {

			tcb_desc->bAMPDUEnable = true;

			tcb_desc->ampdu_factor = pHTInfo->CurrentAMPDUFactor;

			tcb_desc->ampdu_density = pHTInfo->CurrentMPDUDensity;

			tcb_desc->ampdu_density = pHTInfo->current_mpdu_density;

		}

	}

FORCED_AGG_SETTING:
@@ -325,8 +325,8 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee, 


	case HT_AGG_FORCE_ENABLE:

		tcb_desc->bAMPDUEnable = true;

		tcb_desc->ampdu_density = pHTInfo->ForcedMPDUDensity;

		tcb_desc->ampdu_factor = pHTInfo->ForcedAMPDUFactor;

		tcb_desc->ampdu_density = pHTInfo->forced_mpdu_density;

		tcb_desc->ampdu_factor = pHTInfo->forced_ampdu_factor;

		break;



	case HT_AGG_FORCE_DISABLE: