diff options
| author | Gary Rookard <garyrookard@fastmail.org> | 2023-12-07 20:55:32 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-12-09 15:07:18 +0100 |
| commit | da811655dddb71332905a7c7f4abfa4f9ecd38c1 (patch) | |
| tree | 3c3d4248af4fb429ab89b3123a68e247c5e8b8fe | |
| parent | 13afc9bd5349925b104cd751ea67d07d5cff9433 (diff) | |
| download | linux-stable-da811655dddb71332905a7c7f4abfa4f9ecd38c1.tar.gz linux-stable-da811655dddb71332905a7c7f4abfa4f9ecd38c1.tar.bz2 linux-stable-da811655dddb71332905a7c7f4abfa4f9ecd38c1.zip | |
staging: rtl8192e: renamed variable bCurShortGI40MHz
Coding style issue, checkpatch Avoid CamelCase,
rename it. bCurShortGI40MHz -> cur_short_gi_40mhz
Signed-off-by: Gary Rookard <garyrookard@fastmail.org>
Link: https://lore.kernel.org/r/20231208015536.21013-2-garyrookard@fastmail.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_HT.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_tx.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 39fa5f60db45..f01240f7e514 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1763,7 +1763,7 @@ void rtl92e_update_ratr_table(struct net_device *dev) } ratr_value &= 0x0FFFFFFF; if (ieee->ht_info->cur_tx_bw40mhz && - ieee->ht_info->bCurShortGI40MHz) + ieee->ht_info->cur_short_gi_40mhz) ratr_value |= 0x80000000; else if (!ieee->ht_info->cur_tx_bw40mhz && ieee->ht_info->bCurShortGI20MHz) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index 330dafd62656..c73d2ac910d5 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -287,7 +287,7 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev) if (priv->rtllib->link_state == MAC80211_LINKED) { bshort_gi_enabled = (ht_info->cur_tx_bw40mhz && - ht_info->bCurShortGI40MHz) || + ht_info->cur_short_gi_40mhz) || (!ht_info->cur_tx_bw40mhz && ht_info->bCurShortGI20MHz); diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index 98c1e5840e31..f89b618f71a5 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -97,7 +97,7 @@ struct rt_hi_throughput { u8 reg_bw_40mhz; u8 cur_bw_40mhz; u8 reg_short_gi_40mhz; - u8 bCurShortGI40MHz; + u8 cur_short_gi_40mhz; u8 reg_short_gi_20mhz; u8 bCurShortGI20MHz; u8 reg_supp_cck; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index a421c56af9e2..f9c76aaf8791 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -109,7 +109,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 isShortGI = (ht_info->cur_bw_40mhz) ? - ((ht_info->bCurShortGI40MHz) ? 1 : 0) : + ((ht_info->cur_short_gi_40mhz) ? 1 : 0) : ((ht_info->bCurShortGI20MHz) ? 1 : 0); return MCS_DATA_RATE[is40MHz][isShortGI][(mcs_rate & 0x7f)]; } @@ -481,7 +481,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) ht_info->bCurShortGI20MHz = ((ht_info->reg_short_gi_20mhz) ? ((pPeerHTCap->ShortGI20Mhz == 1) ? true : false) : false); - ht_info->bCurShortGI40MHz = ((ht_info->reg_short_gi_40mhz) ? + ht_info->cur_short_gi_40mhz = ((ht_info->reg_short_gi_40mhz) ? ((pPeerHTCap->ShortGI40Mhz == 1) ? true : false) : false); @@ -563,7 +563,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) ht_info->cur_tx_bw40mhz = false; ht_info->bCurShortGI20MHz = false; - ht_info->bCurShortGI40MHz = false; + ht_info->cur_short_gi_40mhz = false; ht_info->forced_short_gi = false; ht_info->bCurSuppCCK = true; diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c index b8f8c9039e01..d51f4f3310d5 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -362,7 +362,7 @@ static void rtllib_query_HTCapShortGI(struct rtllib_device *ieee, return; } - if (ht_info->cur_bw_40mhz && ht_info->bCurShortGI40MHz) + if (ht_info->cur_bw_40mhz && ht_info->cur_short_gi_40mhz) tcb_desc->bUseShortGI = true; else if (!ht_info->cur_bw_40mhz && ht_info->bCurShortGI20MHz) tcb_desc->bUseShortGI = true; |