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

staging: rtl8192e: Rename RxPathSelectio.., RateAdaptive.. and RateAdap.. 



Rename constants RxPathSelection_diff_TH to RX_PATH_SEL_DIFF_TH,
RateAdaptiveTH_High to RATE_ADAPTIVE_TH_HIGH and RateAdaptiveTH_Low_20M
to RATE_ADAPTIVE_TH_LOW_20M 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/3fb44a7f8020b898d3f589f16e9be4f555aa9e1e.1675792435.git.philipp.g.hortmann@gmail.com


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

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+4 −4
Original line number Diff line number Diff line
@@ -2017,20 +2017,20 @@ bool rtl92e_is_rx_stuck(struct net_device *dev) 
	u8		SilentResetRxSoltNum = 4;



	rx_chk_cnt++;

	if (priv->undecorated_smoothed_pwdb >= (RateAdaptiveTH_High+5)) {

	if (priv->undecorated_smoothed_pwdb >= (RATE_ADAPTIVE_TH_HIGH + 5)) {

		rx_chk_cnt = 0;

	} else if ((priv->undecorated_smoothed_pwdb < (RateAdaptiveTH_High + 5))

	} else if ((priv->undecorated_smoothed_pwdb < (RATE_ADAPTIVE_TH_HIGH + 5))

	  && (((priv->current_chnl_bw != HT_CHANNEL_WIDTH_20) &&

	  (priv->undecorated_smoothed_pwdb >= RateAdaptiveTH_Low_40M))

	  || ((priv->current_chnl_bw == HT_CHANNEL_WIDTH_20) &&

	  (priv->undecorated_smoothed_pwdb >= RateAdaptiveTH_Low_20M)))) {

	  (priv->undecorated_smoothed_pwdb >= RATE_ADAPTIVE_TH_LOW_20M)))) {

		if (rx_chk_cnt < 2)

			return bStuck;

		rx_chk_cnt = 0;

	} else if ((((priv->current_chnl_bw != HT_CHANNEL_WIDTH_20) &&

		  (priv->undecorated_smoothed_pwdb < RateAdaptiveTH_Low_40M)) ||

		((priv->current_chnl_bw == HT_CHANNEL_WIDTH_20) &&

		 (priv->undecorated_smoothed_pwdb < RateAdaptiveTH_Low_20M))) &&

		 (priv->undecorated_smoothed_pwdb < RATE_ADAPTIVE_TH_LOW_20M))) &&

		priv->undecorated_smoothed_pwdb >= VeryLowRSSI) {

		if (rx_chk_cnt < 4)

			return bStuck;

drivers/staging/rtl8192e/rtl8192e/rtl_dm.c

+5 −5
Original line number Diff line number Diff line
@@ -282,12 +282,12 @@ void rtl92e_init_adaptive_rate(struct net_device *dev) 
	struct rate_adaptive *pra = &priv->rate_adaptive;



	pra->ratr_state = DM_RATR_STA_MAX;

	pra->high2low_rssi_thresh_for_ra = RateAdaptiveTH_High;

	pra->low2high_rssi_thresh_for_ra20M = RateAdaptiveTH_Low_20M+5;

	pra->high2low_rssi_thresh_for_ra = RATE_ADAPTIVE_TH_HIGH;

	pra->low2high_rssi_thresh_for_ra20M = RATE_ADAPTIVE_TH_LOW_20M + 5;

	pra->low2high_rssi_thresh_for_ra40M = RateAdaptiveTH_Low_40M+5;



	pra->high_rssi_thresh_for_ra = RateAdaptiveTH_High+5;

	pra->low_rssi_thresh_for_ra20M = RateAdaptiveTH_Low_20M;

	pra->high_rssi_thresh_for_ra = RATE_ADAPTIVE_TH_HIGH + 5;

	pra->low_rssi_thresh_for_ra20M = RATE_ADAPTIVE_TH_LOW_20M;

	pra->low_rssi_thresh_for_ra40M = RateAdaptiveTH_Low_40M;



	if (priv->customer_id == RT_CID_819X_NETCORE)
@@ -1733,7 +1733,7 @@ static void _rtl92e_dm_init_rx_path_selection(struct net_device *dev) 


	DM_RxPathSelTable.Enable = 1;

	DM_RxPathSelTable.SS_TH_low = RX_PATH_SEL_SS_TH_LOW;

	DM_RxPathSelTable.diff_TH = RxPathSelection_diff_TH;

	DM_RxPathSelTable.diff_TH = RX_PATH_SEL_DIFF_TH;

	if (priv->customer_id == RT_CID_819X_NETCORE)

		DM_RxPathSelTable.cck_method = CCK_Rx_Version_2;

	else

drivers/staging/rtl8192e/rtl8192e/rtl_dm.h

+3 −3
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 
#define		DM_DIG_MIN_Netcore			0x12



#define		RX_PATH_SEL_SS_TH_LOW			30

#define		RxPathSelection_diff_TH			18

#define		RX_PATH_SEL_DIFF_TH			18



#define		RateAdaptiveTH_High			50

#define		RateAdaptiveTH_Low_20M		30

#define		RATE_ADAPTIVE_TH_HIGH			50

#define		RATE_ADAPTIVE_TH_LOW_20M		30

#define		RateAdaptiveTH_Low_40M		10

#define		VeryLowRSSI					15