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

staging: rtl8192e: Rename dot11Cur..., bCurTxBW40MHz and bCurrentRT2... 



Rename variable dot11CurrentPreambleMode to dot11_current_preamble_mode,
bCurTxBW40MHz to cur_tx_bw40mhz and bCurrentRT2RTLongSlotTime to
current_rt2rt_long_slot_time 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/97c4f62da9a98b0ddcdaafae68182e3eb47f9a17.1664055213.git.philipp.g.hortmann@gmail.com


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

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+3 −3
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ static void _rtl92e_net_update(struct net_device *dev) 


	net = &priv->rtllib->current_network;

	rtl92e_config_rate(dev, &rate_config);

	priv->dot11CurrentPreambleMode = PREAMBLE_AUTO;

	priv->dot11_current_preamble_mode = PREAMBLE_AUTO;

	priv->basic_rate = rate_config &= 0x15f;

	rtl92e_writew(dev, BSSIDR, *(u16 *)net->bssid);

	rtl92e_writel(dev, BSSIDR + 2, *(u32 *)(net->bssid + 2));
@@ -1998,10 +1998,10 @@ void rtl92e_update_ratr_table(struct net_device *dev) 
		break;

	}

	ratr_value &= 0x0FFFFFFF;

	if (ieee->pHTInfo->bCurTxBW40MHz &&

	if (ieee->pHTInfo->cur_tx_bw40mhz &&

	    ieee->pHTInfo->bCurShortGI40MHz)

		ratr_value |= 0x80000000;

	else if (!ieee->pHTInfo->bCurTxBW40MHz &&

	else if (!ieee->pHTInfo->cur_tx_bw40mhz &&

		  ieee->pHTInfo->bCurShortGI20MHz)

		ratr_value |= 0x80000000;

	rtl92e_writel(dev, RATR0+rate_index*4, ratr_value);

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+7 −7
Original line number Diff line number Diff line
@@ -287,16 +287,16 @@ static void _rtl92e_update_cap(struct net_device *dev, u16 cap) 
	bool		ShortPreamble;



	if (cap & WLAN_CAPABILITY_SHORT_PREAMBLE) {

		if (priv->dot11CurrentPreambleMode != PREAMBLE_SHORT) {

		if (priv->dot11_current_preamble_mode != PREAMBLE_SHORT) {

			ShortPreamble = true;

			priv->dot11CurrentPreambleMode = PREAMBLE_SHORT;

			priv->dot11_current_preamble_mode = PREAMBLE_SHORT;

			priv->rtllib->SetHwRegHandler(dev, HW_VAR_ACK_PREAMBLE,

					(unsigned char *)&ShortPreamble);

		}

	} else {

		if (priv->dot11CurrentPreambleMode != PREAMBLE_LONG) {

		if (priv->dot11_current_preamble_mode != PREAMBLE_LONG) {

			ShortPreamble = false;

			priv->dot11CurrentPreambleMode = PREAMBLE_LONG;

			priv->dot11_current_preamble_mode = PREAMBLE_LONG;

			priv->rtllib->SetHwRegHandler(dev, HW_VAR_ACK_PREAMBLE,

					      (unsigned char *)&ShortPreamble);

		}
@@ -307,7 +307,7 @@ static void _rtl92e_update_cap(struct net_device *dev, u16 cap) 
		u8	cur_slot_time = priv->slot_time;



		if ((cap & WLAN_CAPABILITY_SHORT_SLOT_TIME) &&

		   (!priv->rtllib->pHTInfo->bCurrentRT2RTLongSlotTime)) {

		   (!priv->rtllib->pHTInfo->current_rt2rt_long_slot_time)) {

			if (cur_slot_time != SHORT_SLOT_TIME) {

				slot_time_val = SHORT_SLOT_TIME;

				priv->rtllib->SetHwRegHandler(dev,
@@ -341,7 +341,7 @@ static void _rtl92e_update_beacon(void *data) 


	if (ieee->pHTInfo->bCurrentHTSupport)

		HT_update_self_and_peer_setting(ieee, net);

	ieee->pHTInfo->bCurrentRT2RTLongSlotTime = net->bssht.bd_rt2rt_long_slot_time;

	ieee->pHTInfo->current_rt2rt_long_slot_time = net->bssht.bd_rt2rt_long_slot_time;

	ieee->pHTInfo->RT2RT_HT_Mode = net->bssht.rt2rt_ht_mode;

	_rtl92e_update_cap(dev, net->capability);

}
@@ -833,7 +833,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) 
	u8 i;



	priv->AcmMethod = eAcmWay2_SW;

	priv->dot11CurrentPreambleMode = PREAMBLE_AUTO;

	priv->dot11_current_preamble_mode = PREAMBLE_AUTO;

	priv->rtllib->status = 0;

	priv->polling_timer_on = 0;

	priv->up_first_time = 1;

drivers/staging/rtl8192e/rtl8192e/rtl_core.h

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ struct r8192_priv { 


	u16 basic_rate;

	u8 short_preamble;

	u8 dot11CurrentPreambleMode;

	u8 dot11_current_preamble_mode;

	u8 slot_time;

	u16 SifsTime;

drivers/staging/rtl8192e/rtl8192e/rtl_dm.c

+2 −2
Original line number Diff line number Diff line
@@ -343,9 +343,9 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev) 


	if (priv->rtllib->state == RTLLIB_LINKED) {



		bshort_gi_enabled = (pHTInfo->bCurTxBW40MHz &&

		bshort_gi_enabled = (pHTInfo->cur_tx_bw40mhz &&

				     pHTInfo->bCurShortGI40MHz) ||

				    (!pHTInfo->bCurTxBW40MHz &&

				    (!pHTInfo->cur_tx_bw40mhz &&

				     pHTInfo->bCurShortGI20MHz);



		pra->upper_rssi_threshold_ratr =

drivers/staging/rtl8192e/rtl819x_HT.h

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ struct rt_hi_throughput { 
	u8				PeerMimoPs;



	enum ht_extchnl_offset CurSTAExtChnlOffset;

	u8				bCurTxBW40MHz;

	u8 cur_tx_bw40mhz;

	u8				PeerBandwidth;



	u8				bSwBwInProgress;
@@ -157,7 +157,7 @@ struct rt_hi_throughput { 
	u8				bRegRT2RTAggregation;

	u8				RT2RT_HT_Mode;

	u8				bCurrentRT2RTAggregation;

	u8				bCurrentRT2RTLongSlotTime;

	u8 current_rt2rt_long_slot_time;

	u8				szRT2RTAggBuffer[10];



	u8				bRegRxReorderEnable;