From: Gary Rookard <garyrookard@fastmail.org>
To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Gary Rookard <garyrookard@fastmail.org>
Subject: [PATCH 1/5] staging: rtl8192e: renamed variable bCurShortGI40MHz
Date: Thu, 7 Dec 2023 20:55:32 -0500 [thread overview]
Message-ID: <20231208015536.21013-2-garyrookard@fastmail.org> (raw)
In-Reply-To: <20231208015536.21013-1-garyrookard@fastmail.org>
Coding style issue, checkpatch Avoid CamelCase,
rename it. bCurShortGI40MHz -> cur_short_gi_40mhz
Signed-off-by: Gary Rookard <garyrookard@fastmail.org>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +-
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +-
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 +++---
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 e2dd2772bbeb..041520e6c28d 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;
--
2.41.0
next prev parent reply other threads:[~2023-12-08 1:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-08 1:55 [PATCH 0/5] staging: rtl8192e: patch series renames (5) different variables Gary Rookard
2023-12-08 1:55 ` Gary Rookard [this message]
2023-12-08 1:55 ` [PATCH 2/5] staging: rtl8192e: renamed variable bCurShortGI20MHz Gary Rookard
2023-12-08 1:55 ` [PATCH 3/5] staging: rtl8192e: renamed variable CCKOFDMRate Gary Rookard
2023-12-08 1:55 ` [PATCH 4/5] staging: rtl8192e: renamed variable HTIOTActIsCCDFsync Gary Rookard
2023-12-08 17:49 ` [PATCH 0/5] staging: rtl8192e: patch series renames (5) different variables Philipp Hortmann
2023-12-08 21:56 ` Gary Rookard
2023-12-09 17:16 ` Philipp Hortmann
2023-12-09 0:41 ` Gary Rookard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231208015536.21013-2-garyrookard@fastmail.org \
--to=garyrookard@fastmail.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=philipp.g.hortmann@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox