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

staging: rtl8192e: Rename RFInProgres.., bEnableHT and RegChannelPlan 



Rename variable RFInProgressTimeOut to rf_in_progress_timeout, bEnableHT
to enable_ht and RegChannelPlan to reg_chnl_plan 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/aa3b8fd4a51fc9b1c32566cd079590bf11a9190d.1668313325.git.philipp.g.hortmann@gmail.com


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

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+2 −2
Original line number Diff line number Diff line
@@ -474,10 +474,10 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) 


	priv->rf_chip = RF_8256;



	if (priv->RegChannelPlan == 0xf)

	if (priv->reg_chnl_plan == 0xf)

		priv->ChannelPlan = priv->eeprom_ChannelPlan;

	else

		priv->ChannelPlan = priv->RegChannelPlan;

		priv->ChannelPlan = priv->reg_chnl_plan;



	if (priv->eeprom_vid == 0x1186 &&  priv->eeprom_did == 0x3304)

		priv->CustomerID =  RT_CID_DLINK;

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+6 −6
Original line number Diff line number Diff line
@@ -672,9 +672,9 @@ void rtl92e_set_wireless_mode(struct net_device *dev, u8 wireless_mode) 


	if ((wireless_mode == WIRELESS_MODE_N_24G) ||

	    (wireless_mode == WIRELESS_MODE_N_5G)) {

		priv->rtllib->pHTInfo->bEnableHT = 1;

		priv->rtllib->pHTInfo->enable_ht = 1;

	} else {

		priv->rtllib->pHTInfo->bEnableHT = 0;

		priv->rtllib->pHTInfo->enable_ht = 0;

	}

	_rtl92e_refresh_support_rate(priv);

}
@@ -723,7 +723,7 @@ static int _rtl92e_sta_down(struct net_device *dev, bool shutdownrf) 
{

	struct r8192_priv *priv = rtllib_priv(dev);

	unsigned long flags = 0;

	u8 RFInProgressTimeOut = 0;

	u8 rf_in_progress_timeout = 0;



	if (priv->up == 0)

		return -1;
@@ -755,12 +755,12 @@ static int _rtl92e_sta_down(struct net_device *dev, bool shutdownrf) 
	spin_lock_irqsave(&priv->rf_ps_lock, flags);

	while (priv->rf_change_in_progress) {

		spin_unlock_irqrestore(&priv->rf_ps_lock, flags);

		if (RFInProgressTimeOut > 100) {

		if (rf_in_progress_timeout > 100) {

			spin_lock_irqsave(&priv->rf_ps_lock, flags);

			break;

		}

		mdelay(1);

		RFInProgressTimeOut++;

		rf_in_progress_timeout++;

		spin_lock_irqsave(&priv->rf_ps_lock, flags);

	}

	priv->rf_change_in_progress = true;
@@ -845,7 +845,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) 
	priv->rxringcount = MAX_RX_COUNT;

	priv->irq_enabled = 0;

	priv->chan = 1;

	priv->RegChannelPlan = 0xf;

	priv->reg_chnl_plan = 0xf;

	priv->rtllib->mode = WIRELESS_MODE_AUTO;

	priv->rtllib->iw_mode = IW_MODE_INFRA;

	priv->rtllib->bNetPromiscuousMode = false;

drivers/staging/rtl8192e/rtl8192e/rtl_core.h

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


	bool bTXPowerDataReadFromEEPORM;



	u16 RegChannelPlan;

	u16 reg_chnl_plan;

	u16 ChannelPlan;

	u8 bHwRfOffAction;

drivers/staging/rtl8192e/rtl819x_HT.h

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ enum ht_aggre_mode { 




struct rt_hi_throughput {

	u8				bEnableHT;

	u8				enable_ht;

	u8				bCurrentHTSupport;



	u8				bRegBW40MHz;

drivers/staging/rtl8192e/rtl819x_HTProc.c

+2 −2
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee, 
	struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;

	u8	bIOTAction = 0;



	/* unmark bEnableHT flag here is the same reason why unmarked in

	/* unmark enable_ht flag here is the same reason why unmarked in

	 * function rtllib_softmac_new_net. WB 2008.09.10

	 */

	if (pNetwork->bssht.bd_support_ht) {
@@ -776,7 +776,7 @@ void HTUseDefaultSetting(struct rtllib_device *ieee) 
{

	struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;



	if (pHTInfo->bEnableHT) {

	if (pHTInfo->enable_ht) {

		pHTInfo->bCurrentHTSupport = true;

		pHTInfo->bCurSuppCCK = pHTInfo->bRegSuppCCK;