Commit ba15ff48 authored by Tree Davies's avatar Tree Davies Committed by Greg Kroah-Hartman

Staging: rtl8192e: Rename variable BssCcxVerNumber

Rename variable BssCcxVerNumber to bss_ccx_ver_number to fix checkpatch
warning Avoid CamelCase.
Signed-off-by: default avatarTree Davies <tdavies@darkphysics.net>
Tested-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/20240227044157.407379-11-tdavies@darkphysics.netSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fbf63623
......@@ -918,7 +918,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;
......
......@@ -1840,10 +1840,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 &&
......@@ -2353,7 +2353,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)
......
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment