From: Tree Davies <tdavies@darkphysics.net>
To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Tree Davies <tdavies@darkphysics.net>
Subject: [PATCH 05/18] Staging: rtl8192e: Rename variable ChlWidth
Date: Sun, 28 Apr 2024 16:00:53 -0700 [thread overview]
Message-ID: <20240428230106.6548-6-tdavies@darkphysics.net> (raw)
In-Reply-To: <20240428230106.6548-1-tdavies@darkphysics.net>
Rename variable ChlWidth to chl_width
to fix checkpatch warning Avoid CamelCase.
Signed-off-by: Tree Davies <tdavies@darkphysics.net>
---
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 10 +++++-----
drivers/staging/rtl8192e/rtllib_rx.c | 2 +-
drivers/staging/rtl8192e/rtllib_wx.c | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index 7e0f64df01ea..938be9c27e0b 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -25,7 +25,7 @@ enum ht_extchnl_offset {
struct ht_capab_ele {
u8 AdvCoding:1;
- u8 ChlWidth:1;
+ u8 chl_width:1;
u8 MimoPwrSave:2;
u8 GreenField:1;
u8 ShortGI20Mhz:1;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 503ea1e92a7d..b79ea0b42e44 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -253,9 +253,9 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
cap_ele->AdvCoding = 0;
if (ieee->get_half_nmode_support_by_aps_handler(ieee->dev))
- cap_ele->ChlWidth = 0;
+ cap_ele->chl_width = 0;
else
- cap_ele->ChlWidth = 1;
+ cap_ele->chl_width = 1;
cap_ele->MimoPwrSave = 3;
cap_ele->GreenField = 0;
@@ -272,7 +272,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
netdev_dbg(ieee->dev,
"TX HT cap/info ele BW=%d MaxAMSDUSize:%d DssCCk:%d\n",
- cap_ele->ChlWidth, cap_ele->MaxAMSDUSize, cap_ele->DssCCk);
+ cap_ele->chl_width, cap_ele->MaxAMSDUSize, cap_ele->DssCCk);
if (is_encrypt) {
cap_ele->MPDUDensity = 7;
@@ -302,7 +302,7 @@ void ht_construct_capability_element(struct rtllib_device *ieee, u8 *pos_ht_cap,
cap_ele->ShortGI40Mhz = 0;
if (ieee->get_half_nmode_support_by_aps_handler(ieee->dev)) {
- cap_ele->ChlWidth = 0;
+ cap_ele->chl_width = 0;
cap_ele->MCS[1] = 0;
}
}
@@ -452,7 +452,7 @@ void ht_on_assoc_rsp(struct rtllib_device *ieee)
print_hex_dump_bytes("%s: ", __func__, DUMP_PREFIX_NONE,
pPeerHTCap, sizeof(struct ht_capab_ele));
#endif
- ht_set_connect_bw_mode(ieee, (enum ht_channel_width)(pPeerHTCap->ChlWidth),
+ ht_set_connect_bw_mode(ieee, (enum ht_channel_width)(pPeerHTCap->chl_width),
(enum ht_extchnl_offset)(pPeerHTInfo->ExtChlOffset));
ht_info->cur_tx_bw40mhz = ((pPeerHTInfo->RecommemdedTxWidth == 1) ?
true : false);
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index ebf8a2fd36d3..ee469c9118b8 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -1877,7 +1877,7 @@ static void rtllib_parse_mfie_ht_cap(struct rtllib_info_element *info_element,
ht->bd_bandwidth = (enum ht_channel_width)
(((struct ht_capab_ele *)
- (ht->bd_ht_cap_buf))->ChlWidth);
+ (ht->bd_ht_cap_buf))->chl_width);
} else {
ht->bd_support_ht = false;
ht->bd_ht_1r = false;
diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index 55a3e4222cd6..1cfd109881ad 100644
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -129,8 +129,8 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
else
ht_cap = (struct ht_capab_ele *)
&network->bssht.bd_ht_cap_buf[0];
- is40M = (ht_cap->ChlWidth) ? 1 : 0;
- isShortGI = (ht_cap->ChlWidth) ?
+ is40M = (ht_cap->chl_width) ? 1 : 0;
+ isShortGI = (ht_cap->chl_width) ?
((ht_cap->ShortGI40Mhz) ? 1 : 0) :
((ht_cap->ShortGI20Mhz) ? 1 : 0);
--
2.30.2
next prev parent reply other threads:[~2024-04-28 23:01 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-28 23:00 [PATCH 00/18] Staging: rtl8192e: Rename variables in rtl819x_HTProc.c Tree Davies
2024-04-28 23:00 ` [PATCH 01/18] Staging: rtl8192e: Rename variable CurSTAExtChnlOffset Tree Davies
2024-04-28 23:00 ` [PATCH 02/18] Staging: rtl8192e: Rename variable CurrentAMPDUFactor Tree Davies
2024-04-28 23:00 ` [PATCH 03/18] Staging: rtl8192e: Rename variable OptMode Tree Davies
2024-04-28 23:00 ` [PATCH 04/18] Staging: rtl8192e: Rename variable LSigTxopProtect Tree Davies
2024-04-28 23:00 ` Tree Davies [this message]
2024-04-28 23:00 ` [PATCH 06/18] Staging: rtl8192e: Rename variable AdvCoding Tree Davies
2024-04-28 23:00 ` [PATCH 07/18] Staging: rtl8192e: Rename variable MimoPwrSave Tree Davies
2024-04-28 23:00 ` [PATCH 08/18] Staging: rtl8192e: Rename variable ShortGI40Mhz Tree Davies
2024-04-28 23:00 ` [PATCH 09/18] Staging: rtl8192e: Rename variable ShortGI20Mhz Tree Davies
2024-04-28 23:00 ` [PATCH 10/18] Staging: rtl8192e: Rename variable GreenField Tree Davies
2024-04-28 23:00 ` [PATCH 11/18] Staging: rtl8192e: Rename variable TxSTBC Tree Davies
2024-04-28 23:01 ` [PATCH 12/18] Staging: rtl8192e: Rename variable RxSTBC Tree Davies
2024-04-28 23:01 ` [PATCH 13/18] Staging: rtl8192e: Rename variable DelayBA Tree Davies
2024-04-28 23:01 ` [PATCH 14/18] Staging: rtl8192e: Rename variable MaxAMSDUSize Tree Davies
2024-04-28 23:01 ` [PATCH 15/18] Staging: rtl8192e: Rename variable MaxRxAMPDUFactor Tree Davies
2024-04-28 23:01 ` [PATCH 16/18] Staging: rtl8192e: Rename variable MPDUDensity Tree Davies
2024-04-28 23:01 ` [PATCH 17/18] Staging: rtl8192e: Rename variable ExtHTCapInfo Tree Davies
2024-04-28 23:01 ` [PATCH 18/18] Staging: rtl8192e: Rename variable DssCCk Tree Davies
2024-04-29 17:40 ` [PATCH 00/18] Staging: rtl8192e: Rename variables in rtl819x_HTProc.c Philipp Hortmann
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=20240428230106.6548-6-tdavies@darkphysics.net \
--to=tdavies@darkphysics.net \
--cc=anjan@momi.ca \
--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