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

staging: rtl8192e: Rename pHTInfo 



Rename variable pHTInfo to ht_info 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/88cdc0ef393c92cb2102a66893c5320e8c8606df.1668313325.git.philipp.g.hortmann@gmail.com


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

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

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

	case IEEE_N_24G:

	case IEEE_N_5G:

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

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

			ratr_value &= 0x0007F007;

		} else {

			if (priv->rf_type == RF_1T2R)
@@ -1991,11 +1991,11 @@ void rtl92e_update_ratr_table(struct net_device *dev) 
		break;

	}

	ratr_value &= 0x0FFFFFFF;

	if (ieee->pHTInfo->cur_tx_bw40mhz &&

	    ieee->pHTInfo->bCurShortGI40MHz)

	if (ieee->ht_info->cur_tx_bw40mhz &&

	    ieee->ht_info->bCurShortGI40MHz)

		ratr_value |= 0x80000000;

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

		  ieee->pHTInfo->bCurShortGI20MHz)

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

		  ieee->ht_info->bCurShortGI20MHz)

		ratr_value |= 0x80000000;

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

	rtl92e_writeb(dev, UFWP, 1);

drivers/staging/rtl8192e/rtl8192e/rtl_cam.c

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



	ieee->hwsec_active = 1;

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

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

		ieee->hwsec_active = 0;

		SECR_value &= ~SCR_RxDecEnable;

	}

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+6 −6
Original line number Diff line number Diff line
@@ -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->current_rt2rt_long_slot_time)) {

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

			if (cur_slot_time != SHORT_SLOT_TIME) {

				slot_time_val = SHORT_SLOT_TIME;

				priv->rtllib->SetHwRegHandler(dev,
@@ -339,10 +339,10 @@ static void _rtl92e_update_beacon(void *data) 
	struct rtllib_device *ieee = priv->rtllib;

	struct rtllib_network *net = &ieee->current_network;



	if (ieee->pHTInfo->bCurrentHTSupport)

	if (ieee->ht_info->bCurrentHTSupport)

		HT_update_self_and_peer_setting(ieee, net);

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

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

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

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

	_rtl92e_update_cap(dev, net->capability);

}
@@ -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->enable_ht = 1;

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

	} else {

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

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

	}

	_rtl92e_refresh_support_rate(priv);

}

drivers/staging/rtl8192e/rtl8192e/rtl_dm.c

+25 −25
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ void rtl92e_init_adaptive_rate(struct net_device *dev) 
static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)

{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rt_hi_throughput *pHTInfo = priv->rtllib->pHTInfo;

	struct rt_hi_throughput *ht_info = priv->rtllib->ht_info;

	struct rate_adaptive *pra = &priv->rate_adaptive;

	u32 currentRATR, targetRATR = 0;

	u32 LowRSSIThreshForRA = 0, HighRSSIThreshForRA = 0;
@@ -340,10 +340,10 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev) 


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



		bshort_gi_enabled = (pHTInfo->cur_tx_bw40mhz &&

				     pHTInfo->bCurShortGI40MHz) ||

				    (!pHTInfo->cur_tx_bw40mhz &&

				     pHTInfo->bCurShortGI20MHz);

		bshort_gi_enabled = (ht_info->cur_tx_bw40mhz &&

				     ht_info->bCurShortGI40MHz) ||

				    (!ht_info->cur_tx_bw40mhz &&

				     ht_info->bCurShortGI20MHz);



		pra->upper_rssi_threshold_ratr =

				(pra->upper_rssi_threshold_ratr & (~BIT31)) |
@@ -1532,7 +1532,7 @@ void rtl92e_dm_init_edca_turbo(struct net_device *dev) 
static void _rtl92e_dm_check_edca_turbo(struct net_device *dev)

{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rt_hi_throughput *pHTInfo = priv->rtllib->pHTInfo;

	struct rt_hi_throughput *ht_info = priv->rtllib->ht_info;



	static unsigned long lastTxOkCnt;

	static unsigned long lastRxOkCnt;
@@ -1543,18 +1543,18 @@ 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->iot_action & HT_IOT_ACT_DISABLE_EDCA_TURBO)

	if (priv->rtllib->ht_info->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->iot_action & HT_IOT_ACT_EDCA_BIAS_ON_RX) {

		if (ht_info->iot_action & HT_IOT_ACT_EDCA_BIAS_ON_RX) {

			if (curTxOkCnt > 4*curRxOkCnt) {

				if (priv->bis_cur_rdlstate ||

				    !priv->bcurrent_turbo_EDCA) {

					rtl92e_writel(dev, EDCAPARA_BE,

						      edca_setting_UL[pHTInfo->IOTPeer]);

						      edca_setting_UL[ht_info->IOTPeer]);

					priv->bis_cur_rdlstate = false;

				}

			} else {
@@ -1562,10 +1562,10 @@ static void _rtl92e_dm_check_edca_turbo(struct net_device *dev) 
				    !priv->bcurrent_turbo_EDCA) {

					if (priv->rtllib->mode == WIRELESS_MODE_G)

						rtl92e_writel(dev, EDCAPARA_BE,

							      edca_setting_DL_GMode[pHTInfo->IOTPeer]);

							      edca_setting_DL_GMode[ht_info->IOTPeer]);

					else

						rtl92e_writel(dev, EDCAPARA_BE,

							      edca_setting_DL[pHTInfo->IOTPeer]);

							      edca_setting_DL[ht_info->IOTPeer]);

					priv->bis_cur_rdlstate = true;

				}

			}
@@ -1576,17 +1576,17 @@ static void _rtl92e_dm_check_edca_turbo(struct net_device *dev) 
				    !priv->bcurrent_turbo_EDCA) {

					if (priv->rtllib->mode == WIRELESS_MODE_G)

						rtl92e_writel(dev, EDCAPARA_BE,

							      edca_setting_DL_GMode[pHTInfo->IOTPeer]);

							      edca_setting_DL_GMode[ht_info->IOTPeer]);

					else

						rtl92e_writel(dev, EDCAPARA_BE,

							      edca_setting_DL[pHTInfo->IOTPeer]);

							      edca_setting_DL[ht_info->IOTPeer]);

					priv->bis_cur_rdlstate = true;

				}

			} else {

				if (priv->bis_cur_rdlstate ||

				    !priv->bcurrent_turbo_EDCA) {

					rtl92e_writel(dev, EDCAPARA_BE,

						      edca_setting_UL[pHTInfo->IOTPeer]);

						      edca_setting_UL[ht_info->IOTPeer]);

					priv->bis_cur_rdlstate = false;

				}
@@ -1621,23 +1621,23 @@ static void _rtl92e_dm_init_cts_to_self(struct net_device *dev) 
static void _rtl92e_dm_cts_to_self(struct net_device *dev)

{

	struct r8192_priv *priv = rtllib_priv((struct net_device *)dev);

	struct rt_hi_throughput *pHTInfo = priv->rtllib->pHTInfo;

	struct rt_hi_throughput *ht_info = priv->rtllib->ht_info;

	static unsigned long lastTxOkCnt;

	static unsigned long lastRxOkCnt;

	unsigned long curTxOkCnt = 0;

	unsigned long curRxOkCnt = 0;



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

		pHTInfo->iot_action &= ~HT_IOT_ACT_FORCED_CTS2SELF;

		ht_info->iot_action &= ~HT_IOT_ACT_FORCED_CTS2SELF;

		return;

	}

	if (pHTInfo->IOTPeer == HT_IOT_PEER_BROADCOM) {

	if (ht_info->IOTPeer == HT_IOT_PEER_BROADCOM) {

		curTxOkCnt = priv->stats.txbytesunicast - lastTxOkCnt;

		curRxOkCnt = priv->stats.rxbytesunicast - lastRxOkCnt;

		if (curRxOkCnt > 4*curTxOkCnt)

			pHTInfo->iot_action &= ~HT_IOT_ACT_FORCED_CTS2SELF;

			ht_info->iot_action &= ~HT_IOT_ACT_FORCED_CTS2SELF;

		else

			pHTInfo->iot_action |= HT_IOT_ACT_FORCED_CTS2SELF;

			ht_info->iot_action |= HT_IOT_ACT_FORCED_CTS2SELF;



		lastTxOkCnt = priv->stats.txbytesunicast;

		lastRxOkCnt = priv->stats.rxbytesunicast;
@@ -1648,10 +1648,10 @@ static void _rtl92e_dm_cts_to_self(struct net_device *dev) 
static void _rtl92e_dm_init_wa_broadcom_iot(struct net_device *dev)

{

	struct r8192_priv *priv = rtllib_priv((struct net_device *)dev);

	struct rt_hi_throughput *pHTInfo = priv->rtllib->pHTInfo;

	struct rt_hi_throughput *ht_info = priv->rtllib->ht_info;



	pHTInfo->bWAIotBroadcom = false;

	pHTInfo->WAIotTH = WAIotTHVal;

	ht_info->bWAIotBroadcom = false;

	ht_info->WAIotTH = WAIotTHVal;

}



static void _rtl92e_dm_check_rf_ctrl_gpio(void *data)
@@ -1992,7 +1992,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->iot_action & HT_IOT_ACT_CDD_FSYNC)) {

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

		u32 rate_bitmap;



		for (rate_index = 0; rate_index <= 27; rate_index++) {
@@ -2163,7 +2163,7 @@ static void _rtl92e_dm_check_fsync(struct net_device *dev) 
	static u32 reset_cnt;



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

	    priv->rtllib->pHTInfo->IOTPeer == HT_IOT_PEER_BROADCOM) {

	    priv->rtllib->ht_info->IOTPeer == HT_IOT_PEER_BROADCOM) {

		if (priv->rtllib->bfsync_enable == 0) {

			switch (priv->rtllib->fsync_state) {

			case Default_Fsync:
@@ -2288,7 +2288,7 @@ static void _rtl92e_dm_dynamic_tx_power(struct net_device *dev) 
		priv->bDynamicTxLowPower = false;

		return;

	}

	if ((priv->rtllib->pHTInfo->IOTPeer == HT_IOT_PEER_ATHEROS) &&

	if ((priv->rtllib->ht_info->IOTPeer == HT_IOT_PEER_ATHEROS) &&

	    (priv->rtllib->mode == IEEE_G)) {

		txhipower_threshold = TX_POWER_ATHEROAP_THRESH_HIGH;

		txlowpower_threshold = TX_POWER_ATHEROAP_THRESH_LOW;

drivers/staging/rtl8192e/rtl8192e/rtl_wx.c

+1 −1
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ static int _rtl92e_wx_set_encode_ext(struct net_device *dev, 
					 key, 0);

		} else {

			if ((ieee->pairwise_key_type == KEY_TYPE_CCMP) &&

			     ieee->pHTInfo->bCurrentHTSupport)

			     ieee->ht_info->bCurrentHTSupport)

				rtl92e_writeb(dev, 0x173, 1);

			rtl92e_set_key(dev, 4, idx, alg,

				       (u8 *)ieee->ap_mac_addr, 0, key);