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 v2 10/20] Staging: rtl8192e: Rename variable BssCcxVerNumber
Date: Mon, 26 Feb 2024 20:41:47 -0800 [thread overview]
Message-ID: <20240227044157.407379-11-tdavies@darkphysics.net> (raw)
In-Reply-To: <20240227044157.407379-1-tdavies@darkphysics.net>
Rename variable BssCcxVerNumber to bss_ccx_ver_number to fix checkpatch
warning Avoid CamelCase.
Signed-off-by: Tree Davies <tdavies@darkphysics.net>
---
v2: no changes
drivers/staging/rtl8192e/rtllib.h | 2 +-
drivers/staging/rtl8192e/rtllib_rx.c | 6 +++---
drivers/staging/rtl8192e/rtllib_softmac.c | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 9ec4a3b8ae3c..c703e6d95fb9 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -935,7 +935,7 @@ struct rtllib_network {
u8 MBssidMask;
u8 MBssid[ETH_ALEN];
bool bWithCcxVerNum;
- u8 BssCcxVerNumber;
+ u8 bss_ccx_ver_number;
/* These are network statistics */
struct rtllib_rx_stats stats;
u16 capability;
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index 103117692a88..051371e0138c 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -1843,10 +1843,10 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,
info_element->data[3] == 0x03) {
if (info_element->len == 5) {
network->bWithCcxVerNum = true;
- network->BssCcxVerNumber = info_element->data[4];
+ network->bss_ccx_ver_number = info_element->data[4];
} else {
network->bWithCcxVerNum = false;
- network->BssCcxVerNumber = 0;
+ network->bss_ccx_ver_number = 0;
}
}
if (info_element->len > 4 &&
@@ -2356,7 +2356,7 @@ static inline void update_network(struct rtllib_device *ieee,
dst->bMBssidValid = src->bMBssidValid;
memcpy(dst->MBssid, src->MBssid, 6);
dst->bWithCcxVerNum = src->bWithCcxVerNum;
- dst->BssCcxVerNumber = src->BssCcxVerNumber;
+ dst->bss_ccx_ver_number = src->bss_ccx_ver_number;
}
static int IsPassiveChannel(struct rtllib_device *rtllib, u8 channel)
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 477d736fe22d..794c50b2737e 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -744,7 +744,7 @@ rtllib_association_req(struct rtllib_network *beacon,
ckip_ie_len = 30 + 2;
if (beacon->ccx_rm_enable)
ccxrm_ie_len = 6 + 2;
- if (beacon->BssCcxVerNumber >= 2)
+ if (beacon->bss_ccx_ver_number >= 2)
cxvernum_ie_len = 5 + 2;
pmk_cache_idx = sec_is_in_pmkid_list(ieee, ieee->current_network.bssid);
@@ -851,11 +851,11 @@ rtllib_association_req(struct rtllib_network *beacon,
tag += os_ccx_rm_cap.Length;
}
- if (beacon->BssCcxVerNumber >= 2) {
+ if (beacon->bss_ccx_ver_number >= 2) {
u8 CcxVerNumBuf[] = {0x00, 0x40, 0x96, 0x03, 0x00};
struct octet_string osCcxVerNum;
- CcxVerNumBuf[4] = beacon->BssCcxVerNumber;
+ CcxVerNumBuf[4] = beacon->bss_ccx_ver_number;
osCcxVerNum.octet = CcxVerNumBuf;
osCcxVerNum.Length = sizeof(CcxVerNumBuf);
tag = skb_put(skb, cxvernum_ie_len);
--
2.39.2
next prev parent reply other threads:[~2024-02-27 4:42 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-27 4:41 [PATCH v2 00/20] Staging: rtl8192e: Fix checkpatch warning for rtllib_softmac.c Tree Davies
2024-02-27 4:41 ` [PATCH v2 01/20] Staging: rtl8192e: Rename function rtllib_rx_ADDBAReq() Tree Davies
2024-02-27 4:41 ` [PATCH v2 02/20] Staging: rtl8192e: Rename variable NumRecvDataInPeriod Tree Davies
2024-02-27 4:41 ` [PATCH v2 03/20] Staging: rtl8192e: Rename function SecIsInPMKIDList() Tree Davies
2024-02-27 4:41 ` [PATCH v2 04/20] Staging: rtl8192e: Rename variable PMKIDList Tree Davies
2024-02-27 4:41 ` [PATCH v2 05/20] Staging: rtl8192e: Rename variable Turbo_Enable Tree Davies
2024-02-27 4:41 ` [PATCH v2 06/20] Staging: rtl8192e: Rename variable osCcxRmCap Tree Davies
2024-02-27 4:41 ` [PATCH v2 07/20] Staging: rtl8192e: Rename variable bCkipSupported Tree Davies
2024-02-27 4:41 ` [PATCH v2 08/20] Staging: rtl8192e: Rename variable bCcxRmEnable Tree Davies
2024-02-27 4:41 ` [PATCH v2 09/20] Staging: rtl8192e: Rename variable CcxRmCapBuf Tree Davies
2024-02-27 4:41 ` Tree Davies [this message]
2024-02-27 4:41 ` [PATCH v2 11/20] Staging: rtl8192e: Rename variable CcxVerNumBuf Tree Davies
2024-02-27 4:41 ` [PATCH v2 12/20] Staging: rtl8192e: Rename variable asRsn Tree Davies
2024-02-27 4:41 ` [PATCH v2 13/20] Staging: rtl8192e: Rename variable AironetIeOui Tree Davies
2024-02-27 4:41 ` [PATCH v2 14/20] Staging: rtl8192e: Rename variable osCcxAironetIE Tree Davies
2024-02-27 4:41 ` [PATCH v2 15/20] Staging: rtl8192e: Rename variable CcxAironetBuf Tree Davies
2024-02-27 4:41 ` [PATCH v2 16/20] Staging: rtl8192e: Rename varoable osCcxVerNum Tree Davies
2024-02-27 4:41 ` [PATCH v2 17/20] Staging: rtl8192e: Rename varoable asSta Tree Davies
2024-02-27 4:41 ` [PATCH v2 18/20] Staging: rtl8192e: Rename reference AllowAllDestAddrHandler Tree Davies
2024-02-27 4:41 ` [PATCH v2 19/20] Staging: rtl8192e: Rename boolean variable bHalfWirelessN24GMode Tree Davies
2024-02-27 4:41 ` [PATCH v2 20/20] Staging: rtl8192e: Rename function MgntQuery_MgntFrameTxRate Tree Davies
2024-02-27 20:12 ` [PATCH v2 00/20] Staging: rtl8192e: Fix checkpatch warning for rtllib_softmac.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=20240227044157.407379-11-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