Commit 6def63e4 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman

staging: rtl8192e: Rename CCKPresentAtt...

Rename variable CCKPresentAttentuation_20Mdefault to
cck_present_attn_20m_def, CCKPresentAttentuation_40Mdefault to
cck_present_attn_40m_def and CCKPresentAttentuation_difference to
cck_present_attn_diff 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/1254f23aefd25075ef3e16719eed79b461f41e4c.1673290428.git.philipp.g.hortmann@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 48ca41d3
...@@ -787,14 +787,14 @@ bool rtl92e_start_adapter(struct net_device *dev) ...@@ -787,14 +787,14 @@ bool rtl92e_start_adapter(struct net_device *dev)
for (i = 0; i < CCKTxBBGainTableLength; i++) { for (i = 0; i < CCKTxBBGainTableLength; i++) {
if (TempCCk == dm_cck_tx_bb_gain[i][0]) { if (TempCCk == dm_cck_tx_bb_gain[i][0]) {
priv->CCKPresentAttentuation_20Mdefault = i; priv->cck_present_attn_20m_def = i;
break; break;
} }
} }
priv->CCKPresentAttentuation_40Mdefault = 0; priv->cck_present_attn_40m_def = 0;
priv->CCKPresentAttentuation_difference = 0; priv->cck_present_attn_diff = 0;
priv->cck_present_attn = priv->cck_present_attn =
priv->CCKPresentAttentuation_20Mdefault; priv->cck_present_attn_20m_def;
priv->btxpower_tracking = false; priv->btxpower_tracking = false;
} }
} }
......
...@@ -1009,8 +1009,8 @@ static void _rtl92e_cck_tx_power_track_bw_switch_tssi(struct net_device *dev) ...@@ -1009,8 +1009,8 @@ static void _rtl92e_cck_tx_power_track_bw_switch_tssi(struct net_device *dev)
switch (priv->CurrentChannelBW) { switch (priv->CurrentChannelBW) {
case HT_CHANNEL_WIDTH_20: case HT_CHANNEL_WIDTH_20:
priv->cck_present_attn = priv->cck_present_attn =
priv->CCKPresentAttentuation_20Mdefault + priv->cck_present_attn_20m_def +
priv->CCKPresentAttentuation_difference; priv->cck_present_attn_diff;
if (priv->cck_present_attn > if (priv->cck_present_attn >
(CCKTxBBGainTableLength-1)) (CCKTxBBGainTableLength-1))
...@@ -1034,8 +1034,8 @@ static void _rtl92e_cck_tx_power_track_bw_switch_tssi(struct net_device *dev) ...@@ -1034,8 +1034,8 @@ static void _rtl92e_cck_tx_power_track_bw_switch_tssi(struct net_device *dev)
case HT_CHANNEL_WIDTH_20_40: case HT_CHANNEL_WIDTH_20_40:
priv->cck_present_attn = priv->cck_present_attn =
priv->CCKPresentAttentuation_40Mdefault + priv->cck_present_attn_40m_def +
priv->CCKPresentAttentuation_difference; priv->cck_present_attn_diff;
if (priv->cck_present_attn > if (priv->cck_present_attn >
(CCKTxBBGainTableLength - 1)) (CCKTxBBGainTableLength - 1))
......
...@@ -463,9 +463,9 @@ struct r8192_priv { ...@@ -463,9 +463,9 @@ struct r8192_priv {
u8 cck_pwr_enl; u8 cck_pwr_enl;
u16 tssi_13dBm; u16 tssi_13dBm;
u32 pwr_track; u32 pwr_track;
u8 CCKPresentAttentuation_20Mdefault; u8 cck_present_attn_20m_def;
u8 CCKPresentAttentuation_40Mdefault; u8 cck_present_attn_40m_def;
s8 CCKPresentAttentuation_difference; s8 cck_present_attn_diff;
s8 cck_present_attn; s8 cck_present_attn;
long undecorated_smoothed_pwdb; long undecorated_smoothed_pwdb;
......
...@@ -708,21 +708,21 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev) ...@@ -708,21 +708,21 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev)
_rtl92e_dm_tx_update_tssi_strong_signal(dev, RF_Type); _rtl92e_dm_tx_update_tssi_strong_signal(dev, RF_Type);
if (RF_Type == RF_2T4R) { if (RF_Type == RF_2T4R) {
priv->CCKPresentAttentuation_difference priv->cck_present_attn_diff
= priv->rfa_txpowertrackingindex - priv->rfa_txpowertracking_default; = priv->rfa_txpowertrackingindex - priv->rfa_txpowertracking_default;
} else { } else {
priv->CCKPresentAttentuation_difference priv->cck_present_attn_diff
= priv->rfa_txpowertrackingindex_real - priv->rfa_txpowertracking_default; = priv->rfa_txpowertrackingindex_real - priv->rfa_txpowertracking_default;
} }
if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20) if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20)
priv->cck_present_attn = priv->cck_present_attn =
priv->CCKPresentAttentuation_20Mdefault + priv->cck_present_attn_20m_def +
priv->CCKPresentAttentuation_difference; priv->cck_present_attn_diff;
else else
priv->cck_present_attn = priv->cck_present_attn =
priv->CCKPresentAttentuation_40Mdefault + priv->cck_present_attn_40m_def +
priv->CCKPresentAttentuation_difference; priv->cck_present_attn_diff;
if (priv->cck_present_attn > (CCKTxBBGainTableLength-1)) if (priv->cck_present_attn > (CCKTxBBGainTableLength-1))
priv->cck_present_attn = CCKTxBBGainTableLength-1; priv->cck_present_attn = CCKTxBBGainTableLength-1;
...@@ -742,8 +742,8 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev) ...@@ -742,8 +742,8 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev)
rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14); rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);
} }
if (priv->CCKPresentAttentuation_difference <= -12 || if (priv->cck_present_attn_diff <= -12 ||
priv->CCKPresentAttentuation_difference >= 24) { priv->cck_present_attn_diff >= 24) {
priv->rtllib->bdynamic_txpower_enable = true; priv->rtllib->bdynamic_txpower_enable = true;
rtl92e_writeb(dev, Pw_Track_Flag, 0); rtl92e_writeb(dev, Pw_Track_Flag, 0);
rtl92e_writeb(dev, FW_Busy_Flag, 0); rtl92e_writeb(dev, FW_Busy_Flag, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment