Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c972be9a authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman
Browse files

staging:rtl8192u: Rename constants RateAdaptiveTH_Low_* - Style 



The two constants, RateAdaptiveTH_Low_20M and RateAdaptiveTH_Low_40M
generate a checkpatch warning about CamelCase naming. The two have been
renamed to clear this issue. RATE_ADAPTIVE_TH_LOW_20M and
RATE_ADAPTIVE_TH_LOW_40M

This is a coding style change which should have no impact on runtime
code execution.

Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0395a9aa

drivers/staging/rtl8192u/r8192U_core.c

+4 −4
Original line number Diff line number Diff line
@@ -3082,14 +3082,14 @@ static bool HalRxCheckStuck819xUsb(struct net_device *dev) 
	if (priv->undecorated_smoothed_pwdb >= (RATE_ADAPTIVE_TH_HIGH + 5)) {

		rx_chk_cnt = 0;	/* high rssi, check rx stuck right now. */

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

		   ((priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20 && priv->undecorated_smoothed_pwdb >= RateAdaptiveTH_Low_40M) ||

		    (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20 && priv->undecorated_smoothed_pwdb >= RateAdaptiveTH_Low_20M))) {

		   ((priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20 && priv->undecorated_smoothed_pwdb >= RATE_ADAPTIVE_TH_LOW_40M) ||

		    (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20 && priv->undecorated_smoothed_pwdb >= RATE_ADAPTIVE_TH_LOW_20M))) {

		if (rx_chk_cnt < 2)

			return bStuck;



		rx_chk_cnt = 0;

	} else if (((priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20 && priv->undecorated_smoothed_pwdb < RateAdaptiveTH_Low_40M) ||

		    (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20 && priv->undecorated_smoothed_pwdb < RateAdaptiveTH_Low_20M)) &&

	} else if (((priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20 && priv->undecorated_smoothed_pwdb < RATE_ADAPTIVE_TH_LOW_40M) ||

		    (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20 && priv->undecorated_smoothed_pwdb < RATE_ADAPTIVE_TH_LOW_20M)) &&

		     priv->undecorated_smoothed_pwdb >= VeryLowRSSI) {

		if (rx_chk_cnt < 4)

			return bStuck;

drivers/staging/rtl8192u/r8192U_dm.c

+4 −4
Original line number Diff line number Diff line
@@ -244,12 +244,12 @@ void init_rate_adaptive(struct net_device *dev) 


	pra->ratr_state = DM_RATR_STA_MAX;

	pra->high2low_rssi_thresh_for_ra = RATE_ADAPTIVE_TH_HIGH;

	pra->low2high_rssi_thresh_for_ra20M = RateAdaptiveTH_Low_20M+5;

	pra->low2high_rssi_thresh_for_ra40M = RateAdaptiveTH_Low_40M+5;

	pra->low2high_rssi_thresh_for_ra20M = RATE_ADAPTIVE_TH_LOW_20M + 5;

	pra->low2high_rssi_thresh_for_ra40M = RATE_ADAPTIVE_TH_LOW_40M + 5;



	pra->high_rssi_thresh_for_ra = RATE_ADAPTIVE_TH_HIGH + 5;

	pra->low_rssi_thresh_for_ra20M = RateAdaptiveTH_Low_20M;

	pra->low_rssi_thresh_for_ra40M = RateAdaptiveTH_Low_40M;

	pra->low_rssi_thresh_for_ra20M = RATE_ADAPTIVE_TH_LOW_20M;

	pra->low_rssi_thresh_for_ra40M = RATE_ADAPTIVE_TH_LOW_40M;



	if (priv->CustomerID == RT_CID_819x_Netcore)

		pra->ping_rssi_enable = 1;

drivers/staging/rtl8192u/r8192U_dm.h

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ 
#define		RX_PATH_SELECTION_DIFF_TH			18



#define		RATE_ADAPTIVE_TH_HIGH			50

#define		RateAdaptiveTH_Low_20M		30

#define		RateAdaptiveTH_Low_40M		10

#define		RATE_ADAPTIVE_TH_LOW_20M		30

#define		RATE_ADAPTIVE_TH_LOW_40M		10

#define		VeryLowRSSI					15

#define		CTSToSelfTHVal					30