summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorTree Davies <tdavies@darkphysics.net>2024-02-27 05:41:45 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-03-05 15:15:09 +0100
commit98d602e87c9f11a63626a589f6969fd6afc241a8 (patch)
tree67bdd1fdcc189296311ee8d5ee7181c125b1b97d /drivers/staging
parentStaging: rtl8192e: Rename variable bCkipSupported (diff)
downloadlinux-98d602e87c9f11a63626a589f6969fd6afc241a8.tar.xz
linux-98d602e87c9f11a63626a589f6969fd6afc241a8.zip
Staging: rtl8192e: Rename variable bCcxRmEnable
Rename variable bCcxRmEnable to ccx_rm_enable to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies <tdavies@darkphysics.net> Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> Link: https://lore.kernel.org/r/20240227044157.407379-9-tdavies@darkphysics.net Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/rtl8192e/rtllib.h2
-rw-r--r--drivers/staging/rtl8192e/rtllib_rx.c8
-rw-r--r--drivers/staging/rtl8192e/rtllib_softmac.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index cba3f7e7fb85..aae4c62ff286 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -912,7 +912,7 @@ struct rtllib_network {
bool bWithAironetIE;
bool ckip_supported;
- bool bCcxRmEnable;
+ bool ccx_rm_enable;
u8 CcxRmState[2];
bool bMBssidValid;
u8 MBssidMask;
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index a6e97ca6a783..79d74f0ec3b4 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -1815,9 +1815,9 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,
if (info_element->len == 6) {
memcpy(network->CcxRmState, &info_element->data[4], 2);
if (network->CcxRmState[0] != 0)
- network->bCcxRmEnable = true;
+ network->ccx_rm_enable = true;
else
- network->bCcxRmEnable = false;
+ network->ccx_rm_enable = false;
network->MBssidMask = network->CcxRmState[1] & 0x07;
if (network->MBssidMask != 0) {
network->bMBssidValid = true;
@@ -1830,7 +1830,7 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee,
network->bMBssidValid = false;
}
} else {
- network->bCcxRmEnable = false;
+ network->ccx_rm_enable = false;
}
}
if (info_element->len > 4 &&
@@ -2348,7 +2348,7 @@ static inline void update_network(struct rtllib_device *ieee,
dst->bWithAironetIE = src->bWithAironetIE;
dst->ckip_supported = src->ckip_supported;
memcpy(dst->CcxRmState, src->CcxRmState, 2);
- dst->bCcxRmEnable = src->bCcxRmEnable;
+ dst->ccx_rm_enable = src->ccx_rm_enable;
dst->MBssidMask = src->MBssidMask;
dst->bMBssidValid = src->bMBssidValid;
memcpy(dst->MBssid, src->MBssid, 6);
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 0915f4f8761f..f5e0741af047 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -742,7 +742,7 @@ rtllib_association_req(struct rtllib_network *beacon,
if (beacon->ckip_supported)
ckip_ie_len = 30 + 2;
- if (beacon->bCcxRmEnable)
+ if (beacon->ccx_rm_enable)
ccxrm_ie_len = 6 + 2;
if (beacon->BssCcxVerNumber >= 2)
cxvernum_ie_len = 5 + 2;
@@ -837,7 +837,7 @@ rtllib_association_req(struct rtllib_network *beacon,
tag += osCcxAironetIE.Length;
}
- if (beacon->bCcxRmEnable) {
+ if (beacon->ccx_rm_enable) {
static const u8 CcxRmCapBuf[] = {0x00, 0x40, 0x96, 0x01, 0x01,
0x00};
struct octet_string os_ccx_rm_cap;