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

staging: rtl8192e: Rename Regdot11TxHT.., dot11HTOpera.. and RegHTSuppRa.. 



Rename variable Regdot11TxHTOperationalRateSet to
reg_dot11tx_ht_oper_rate_set, dot11HTOperationalRateSet to
dot11ht_oper_rate_set and RegHTSuppRateSet to reg_ht_supp_rate_set 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/0c87e7ffc94be1c26f6400f5e12419f2df0418a3.1668313325.git.philipp.g.hortmann@gmail.com


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

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -1958,7 +1958,7 @@ void rtl92e_update_ratr_table(struct net_device *dev) 
{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rtllib_device *ieee = priv->rtllib;

	u8 *pMcsRate = ieee->dot11HTOperationalRateSet;

	u8 *pMcsRate = ieee->dot11ht_oper_rate_set;

	u32 ratr_value = 0;

	u16 rate_config = 0;

	u8 rate_index = 0;

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+3 −3
Original line number Diff line number Diff line
@@ -608,9 +608,9 @@ static void _rtl92e_refresh_support_rate(struct r8192_priv *priv) 
	if (ieee->mode == WIRELESS_MODE_N_24G ||

	    ieee->mode == WIRELESS_MODE_N_5G) {

		memcpy(ieee->reg_dot11ht_oper_rate_set,

		       ieee->RegHTSuppRateSet, 16);

		memcpy(ieee->Regdot11TxHTOperationalRateSet,

		       ieee->RegHTSuppRateSet, 16);

		       ieee->reg_ht_supp_rate_set, 16);

		memcpy(ieee->reg_dot11tx_ht_oper_rate_set,

		       ieee->reg_ht_supp_rate_set, 16);



	} else {

		memset(ieee->reg_dot11ht_oper_rate_set, 0, 16);

drivers/staging/rtl8192e/rtl819x_HTProc.c

+7 −7
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static u8 HTFilterMCSRate(struct rtllib_device *ieee, u8 *pSupportMCS, 
	u8 i;



	for (i = 0; i <= 15; i++)

		pOperateMCS[i] = ieee->Regdot11TxHTOperationalRateSet[i] &

		pOperateMCS[i] = ieee->reg_dot11tx_ht_oper_rate_set[i] &

				 pSupportMCS[i];



	HT_PickMCSRate(ieee, pOperateMCS);
@@ -604,7 +604,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) 


	HTIOTActDetermineRaFunc(ieee, ((pPeerHTCap->MCS[1]) != 0));



	HTFilterMCSRate(ieee, pPeerHTCap->MCS, ieee->dot11HTOperationalRateSet);

	HTFilterMCSRate(ieee, pPeerHTCap->MCS, ieee->dot11ht_oper_rate_set);



	pHTInfo->peer_mimo_ps = pPeerHTCap->MimoPwrSave;

	if (pHTInfo->peer_mimo_ps == MIMO_PS_STATIC)
@@ -612,7 +612,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) 
	else

		pMcsFilter = MCS_FILTER_ALL;

	ieee->HTHighestOperaRate = HTGetHighestMCSRate(ieee,

						       ieee->dot11HTOperationalRateSet,

						       ieee->dot11ht_oper_rate_set,

						       pMcsFilter);

	ieee->HTCurrentOperaRate = ieee->HTHighestOperaRate;
@@ -661,7 +661,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) 
	pHTInfo->iot_ra_func = 0;



	{

		u8 *RegHTSuppRateSets = &ieee->RegHTSuppRateSet[0];

		u8 *RegHTSuppRateSets = &ieee->reg_ht_supp_rate_set[0];



		RegHTSuppRateSets[0] = 0xFF;

		RegHTSuppRateSets[1] = 0xFF;
@@ -796,10 +796,10 @@ void HTUseDefaultSetting(struct rtllib_device *ieee) 


		pHTInfo->current_mpdu_density = pHTInfo->current_mpdu_density;



		HTFilterMCSRate(ieee, ieee->Regdot11TxHTOperationalRateSet,

				ieee->dot11HTOperationalRateSet);

		HTFilterMCSRate(ieee, ieee->reg_dot11tx_ht_oper_rate_set,

				ieee->dot11ht_oper_rate_set);

		ieee->HTHighestOperaRate = HTGetHighestMCSRate(ieee,

							       ieee->dot11HTOperationalRateSet,

							       ieee->dot11ht_oper_rate_set,

							       MCS_FILTER_ALL);

		ieee->HTCurrentOperaRate = ieee->HTHighestOperaRate;

drivers/staging/rtl8192e/rtllib.h

+3 −3
Original line number Diff line number Diff line
@@ -1436,9 +1436,9 @@ struct rtllib_device { 


	spinlock_t reorder_spinlock;

	u8	reg_dot11ht_oper_rate_set[16];

	u8	Regdot11TxHTOperationalRateSet[16];

	u8	dot11HTOperationalRateSet[16];

	u8	RegHTSuppRateSet[16];

	u8	reg_dot11tx_ht_oper_rate_set[16];

	u8	dot11ht_oper_rate_set[16];

	u8	reg_ht_supp_rate_set[16];

	u8	HTCurrentOperaRate;

	u8	HTHighestOperaRate;

	u8	tx_dis_rate_fallback;

drivers/staging/rtl8192e/rtllib_softmac.c

+5 −5
Original line number Diff line number Diff line
@@ -1532,7 +1532,7 @@ static void rtllib_associate_complete_wq(void *data) 
			    "Successfully associated, ht not enabled(%d, %d)\n",

			    ieee->pHTInfo->bCurrentHTSupport,

			    ieee->pHTInfo->bEnableHT);

		memset(ieee->dot11HTOperationalRateSet, 0, 16);

		memset(ieee->dot11ht_oper_rate_set, 0, 16);

	}

	ieee->LinkDetectInfo.SlotNum = 2 * (1 +

				       ieee->current_network.beacon_interval /
@@ -1728,7 +1728,7 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee, 
					netdev_info(ieee->dev,

						    "Using B rates\n");

				}

				memset(ieee->dot11HTOperationalRateSet, 0, 16);

				memset(ieee->dot11ht_oper_rate_set, 0, 16);

				ieee->state = RTLLIB_LINKED;

			}

		}
@@ -2988,9 +2988,9 @@ int rtllib_softmac_init(struct rtllib_device *ieee) 
	ieee->reg_dot11ht_oper_rate_set[1] = 0xff;

	ieee->reg_dot11ht_oper_rate_set[4] = 0x01;



	ieee->Regdot11TxHTOperationalRateSet[0] = 0xff;

	ieee->Regdot11TxHTOperationalRateSet[1] = 0xff;

	ieee->Regdot11TxHTOperationalRateSet[4] = 0x01;

	ieee->reg_dot11tx_ht_oper_rate_set[0] = 0xff;

	ieee->reg_dot11tx_ht_oper_rate_set[1] = 0xff;

	ieee->reg_dot11tx_ht_oper_rate_set[4] = 0x01;



	ieee->FirstIe_InScan = false;

	ieee->actscanning = false;