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

staging: rtl8192e: Rename PeerMimoPs, IOTAction and IOTRaFunc 



Rename variable PeerMimoPs to peer_mimo_ps, IOTAction to iot_action and
IOTRaFunc to iot_ra_func to avoid CamelCase which is not accepted by
checkpatch. Added spaces around '&' as proposed by checkpatch.

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


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

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -1985,7 +1985,7 @@ void rtl92e_update_ratr_table(struct net_device *dev) 
		break;

	case IEEE_N_24G:

	case IEEE_N_5G:

		if (ieee->pHTInfo->PeerMimoPs == 0) {

		if (ieee->pHTInfo->peer_mimo_ps == 0) {

			ratr_value &= 0x0007F007;

		} else {

			if (priv->rf_type == RF_1T2R)

drivers/staging/rtl8192e/rtl8192e/rtl_cam.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ void rtl92e_enable_hw_security_config(struct net_device *dev) 




	ieee->hwsec_active = 1;

	if ((ieee->pHTInfo->IOTAction&HT_IOT_ACT_PURE_N_MODE) || !hwwep) {

	if ((ieee->pHTInfo->iot_action & HT_IOT_ACT_PURE_N_MODE) || !hwwep) {

		ieee->hwsec_active = 0;

		SECR_value &= ~SCR_RxDecEnable;

	}

drivers/staging/rtl8192e/rtl8192e/rtl_dm.c

+6 −6
Original line number Diff line number Diff line
@@ -1548,13 +1548,13 @@ static void _rtl92e_dm_check_edca_turbo(struct net_device *dev) 
		goto dm_CheckEdcaTurbo_EXIT;

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

		goto dm_CheckEdcaTurbo_EXIT;

	if (priv->rtllib->pHTInfo->IOTAction & HT_IOT_ACT_DISABLE_EDCA_TURBO)

	if (priv->rtllib->pHTInfo->iot_action & HT_IOT_ACT_DISABLE_EDCA_TURBO)

		goto dm_CheckEdcaTurbo_EXIT;



	if (!priv->rtllib->bis_any_nonbepkts) {

		curTxOkCnt = priv->stats.txbytesunicast - lastTxOkCnt;

		curRxOkCnt = priv->stats.rxbytesunicast - lastRxOkCnt;

		if (pHTInfo->IOTAction & HT_IOT_ACT_EDCA_BIAS_ON_RX) {

		if (pHTInfo->iot_action & HT_IOT_ACT_EDCA_BIAS_ON_RX) {

			if (curTxOkCnt > 4*curRxOkCnt) {

				if (priv->bis_cur_rdlstate ||

				    !priv->bcurrent_turbo_EDCA) {
@@ -1633,16 +1633,16 @@ static void _rtl92e_dm_cts_to_self(struct net_device *dev) 
	unsigned long curRxOkCnt = 0;



	if (!priv->rtllib->bCTSToSelfEnable) {

		pHTInfo->IOTAction &= ~HT_IOT_ACT_FORCED_CTS2SELF;

		pHTInfo->iot_action &= ~HT_IOT_ACT_FORCED_CTS2SELF;

		return;

	}

	if (pHTInfo->IOTPeer == HT_IOT_PEER_BROADCOM) {

		curTxOkCnt = priv->stats.txbytesunicast - lastTxOkCnt;

		curRxOkCnt = priv->stats.rxbytesunicast - lastRxOkCnt;

		if (curRxOkCnt > 4*curTxOkCnt)

			pHTInfo->IOTAction &= ~HT_IOT_ACT_FORCED_CTS2SELF;

			pHTInfo->iot_action &= ~HT_IOT_ACT_FORCED_CTS2SELF;

		else

			pHTInfo->IOTAction |= HT_IOT_ACT_FORCED_CTS2SELF;

			pHTInfo->iot_action |= HT_IOT_ACT_FORCED_CTS2SELF;



		lastTxOkCnt = priv->stats.txbytesunicast;

		lastRxOkCnt = priv->stats.rxbytesunicast;
@@ -1997,7 +1997,7 @@ static void _rtl92e_dm_fsync_timer_callback(struct timer_list *t) 


	if (priv->rtllib->state == RTLLIB_LINKED &&

	    priv->rtllib->bfsync_enable &&

	    (priv->rtllib->pHTInfo->IOTAction & HT_IOT_ACT_CDD_FSYNC)) {

	    (priv->rtllib->pHTInfo->iot_action & HT_IOT_ACT_CDD_FSYNC)) {

		u32 rate_bitmap;



		for (rate_index = 0; rate_index <= 27; rate_index++) {

drivers/staging/rtl8192e/rtl819x_BAProc.c

+2 −2
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) 


	if (!ieee->current_network.qos_data.active ||

	    !ieee->pHTInfo->bCurrentHTSupport ||

	    (ieee->pHTInfo->IOTAction & HT_IOT_ACT_REJECT_ADDBA_REQ)) {

	    (ieee->pHTInfo->iot_action & HT_IOT_ACT_REJECT_ADDBA_REQ)) {

		rc = ADDBA_STATUS_REFUSED;

		netdev_warn(ieee->dev,

			    "Failed to reply on ADDBA_REQ as some capability is not ready(%d, %d)\n",
@@ -278,7 +278,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) 
	pBA->ba_start_seq_ctrl = *pBaStartSeqCtrl;



	if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev) ||

	   (ieee->pHTInfo->IOTAction & HT_IOT_ACT_ALLOW_PEER_AGG_ONE_PKT))

	   (ieee->pHTInfo->iot_action & HT_IOT_ACT_ALLOW_PEER_AGG_ONE_PKT))

		pBA->ba_param_set.field.buffer_size = 1;

	else

		pBA->ba_param_set.field.buffer_size = 32;

drivers/staging/rtl8192e/rtl819x_HT.h

+3 −3
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ struct rt_hi_throughput { 
	u8				CurrentOpMode;



	u8				SelfMimoPs;

	u8				PeerMimoPs;

	u8 peer_mimo_ps;



	enum ht_extchnl_offset CurSTAExtChnlOffset;

	u8 cur_tx_bw40mhz;
@@ -169,8 +169,8 @@ struct rt_hi_throughput { 
	u8				bIsPeerBcm;



	u8				IOTPeer;

	u32				IOTAction;

	u8				IOTRaFunc;

	u32 iot_action;

	u8 iot_ra_func;



	u8	bWAIotBroadcom;

	u8	WAIotTH;