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>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 39fa5f60db45754a7c8b3f4c04bb22bc119e1b82..f01240f7e514fe179a4c8b6d27c6de09bc007a3c 100644 (file)
--- 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 330dafd62656a02173b783b286ceee33e3cdf1de..c73d2ac910d54dd782088359f7766e3c97255520 100644 (file)
--- 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 98c1e5840e31b12572d75a55eef4163beeff2ed1..f89b618f71a58aae36ab206cd770912cea70755f 100644 (file)
--- 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 a421c56af9e24ca7d14ece03810273366b753c02..f9c76aaf879112ace080f86045951cb44d2cfabb 100644 (file)
--- 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 b8f8c9039e01fbb240f323fea44fee3f365ecd93..d51f4f3310d561fa40c03c7a5954ca1a9a6471ee 100644 (file)
--- 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;