Commit 5ca1e3c9 authored by Gary Rookard's avatar Gary Rookard Committed by Greg Kroah-Hartman

staging: rtl8192e: renamed variable bCurShortGI20MHz

Coding style issue, checkpatch Avoid CamelCase,
rename it. bCurShortGI20MHz -> cur_short_gi_20mhz
Signed-off-by: default avatarGary Rookard <garyrookard@fastmail.org>
Link: https://lore.kernel.org/r/20231208015536.21013-3-garyrookard@fastmail.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent da811655
...@@ -1766,7 +1766,7 @@ void rtl92e_update_ratr_table(struct net_device *dev) ...@@ -1766,7 +1766,7 @@ void rtl92e_update_ratr_table(struct net_device *dev)
ieee->ht_info->cur_short_gi_40mhz) ieee->ht_info->cur_short_gi_40mhz)
ratr_value |= 0x80000000; ratr_value |= 0x80000000;
else if (!ieee->ht_info->cur_tx_bw40mhz && else if (!ieee->ht_info->cur_tx_bw40mhz &&
ieee->ht_info->bCurShortGI20MHz) ieee->ht_info->cur_short_gi_20mhz)
ratr_value |= 0x80000000; ratr_value |= 0x80000000;
rtl92e_writel(dev, RATR0 + rate_index * 4, ratr_value); rtl92e_writel(dev, RATR0 + rate_index * 4, ratr_value);
rtl92e_writeb(dev, UFWP, 1); rtl92e_writeb(dev, UFWP, 1);
......
...@@ -289,7 +289,7 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev) ...@@ -289,7 +289,7 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev)
bshort_gi_enabled = (ht_info->cur_tx_bw40mhz && bshort_gi_enabled = (ht_info->cur_tx_bw40mhz &&
ht_info->cur_short_gi_40mhz) || ht_info->cur_short_gi_40mhz) ||
(!ht_info->cur_tx_bw40mhz && (!ht_info->cur_tx_bw40mhz &&
ht_info->bCurShortGI20MHz); ht_info->cur_short_gi_20mhz);
pra->upper_rssi_threshold_ratr = pra->upper_rssi_threshold_ratr =
(pra->upper_rssi_threshold_ratr & (~BIT(31))) | (pra->upper_rssi_threshold_ratr & (~BIT(31))) |
......
...@@ -99,7 +99,7 @@ struct rt_hi_throughput { ...@@ -99,7 +99,7 @@ struct rt_hi_throughput {
u8 reg_short_gi_40mhz; u8 reg_short_gi_40mhz;
u8 cur_short_gi_40mhz; u8 cur_short_gi_40mhz;
u8 reg_short_gi_20mhz; u8 reg_short_gi_20mhz;
u8 bCurShortGI20MHz; u8 cur_short_gi_20mhz;
u8 reg_supp_cck; u8 reg_supp_cck;
u8 bCurSuppCCK; u8 bCurSuppCCK;
enum ht_spec_ver ePeerHTSpecVer; enum ht_spec_ver ePeerHTSpecVer;
......
...@@ -110,7 +110,7 @@ static u16 ht_mcs_to_data_rate(struct rtllib_device *ieee, u8 mcs_rate) ...@@ -110,7 +110,7 @@ static u16 ht_mcs_to_data_rate(struct rtllib_device *ieee, u8 mcs_rate)
u8 is40MHz = (ht_info->cur_bw_40mhz) ? 1 : 0; u8 is40MHz = (ht_info->cur_bw_40mhz) ? 1 : 0;
u8 isShortGI = (ht_info->cur_bw_40mhz) ? u8 isShortGI = (ht_info->cur_bw_40mhz) ?
((ht_info->cur_short_gi_40mhz) ? 1 : 0) : ((ht_info->cur_short_gi_40mhz) ? 1 : 0) :
((ht_info->bCurShortGI20MHz) ? 1 : 0); ((ht_info->cur_short_gi_20mhz) ? 1 : 0);
return MCS_DATA_RATE[is40MHz][isShortGI][(mcs_rate & 0x7f)]; return MCS_DATA_RATE[is40MHz][isShortGI][(mcs_rate & 0x7f)];
} }
...@@ -478,7 +478,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) ...@@ -478,7 +478,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee)
ht_info->cur_tx_bw40mhz = ((pPeerHTInfo->RecommemdedTxWidth == 1) ? ht_info->cur_tx_bw40mhz = ((pPeerHTInfo->RecommemdedTxWidth == 1) ?
true : false); true : false);
ht_info->bCurShortGI20MHz = ((ht_info->reg_short_gi_20mhz) ? ht_info->cur_short_gi_20mhz = ((ht_info->reg_short_gi_20mhz) ?
((pPeerHTCap->ShortGI20Mhz == 1) ? ((pPeerHTCap->ShortGI20Mhz == 1) ?
true : false) : false); true : false) : false);
ht_info->cur_short_gi_40mhz = ((ht_info->reg_short_gi_40mhz) ? ht_info->cur_short_gi_40mhz = ((ht_info->reg_short_gi_40mhz) ?
...@@ -562,7 +562,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) ...@@ -562,7 +562,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee)
ht_info->cur_bw_40mhz = false; ht_info->cur_bw_40mhz = false;
ht_info->cur_tx_bw40mhz = false; ht_info->cur_tx_bw40mhz = false;
ht_info->bCurShortGI20MHz = false; ht_info->cur_short_gi_20mhz = false;
ht_info->cur_short_gi_40mhz = false; ht_info->cur_short_gi_40mhz = false;
ht_info->forced_short_gi = false; ht_info->forced_short_gi = false;
......
...@@ -364,7 +364,7 @@ static void rtllib_query_HTCapShortGI(struct rtllib_device *ieee, ...@@ -364,7 +364,7 @@ static void rtllib_query_HTCapShortGI(struct rtllib_device *ieee,
if (ht_info->cur_bw_40mhz && ht_info->cur_short_gi_40mhz) if (ht_info->cur_bw_40mhz && ht_info->cur_short_gi_40mhz)
tcb_desc->bUseShortGI = true; tcb_desc->bUseShortGI = true;
else if (!ht_info->cur_bw_40mhz && ht_info->bCurShortGI20MHz) else if (!ht_info->cur_bw_40mhz && ht_info->cur_short_gi_20mhz)
tcb_desc->bUseShortGI = true; tcb_desc->bUseShortGI = true;
} }
......
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