From ba15ff4840e53c130983188fd2855ae1e45a281c Mon Sep 17 00:00:00 2001 From: Tree Davies Date: Mon, 26 Feb 2024 20:41:47 -0800 Subject: [PATCH] Staging: rtl8192e: Rename variable BssCcxVerNumber Rename variable BssCcxVerNumber to bss_ccx_ver_number to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies Tested-by: Philipp Hortmann Link: https://lore.kernel.org/r/20240227044157.407379-11-tdavies@darkphysics.net Signed-off-by: Greg Kroah-Hartman --- 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 aae4c62ff2864..f5dade9e9a908 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -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; diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index 79d74f0ec3b46..d51b19176f7a0 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -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) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 477d736fe22d4..794c50b2737ec 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.30.2