From: Tree Davies Date: Tue, 21 May 2024 03:16:54 +0000 (-0700) Subject: Staging: rtl8192e: Rename variable MBssidMask X-Git-Tag: v6.11-rc1~101^2~119 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a919bc7d28ae923281f933d6d7596cd27ad6a0c2;p=thirdparty%2Flinux.git Staging: rtl8192e: Rename variable MBssidMask Rename variable MBssidMask to mb_ssid_mask to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies Tested-by: Philipp Hortmann Reviewed-by: Dan Carpenter Link: https://lore.kernel.org/r/20240521031718.17852-8-tdavies@darkphysics.net Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 7f1c2f49227e4..3722fc0cae1dc 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -915,7 +915,7 @@ struct rtllib_network { bool ccx_rm_enable; u8 CcxRmState[2]; bool bMBssidValid; - u8 MBssidMask; + u8 mb_ssid_mask; u8 mb_ssid[ETH_ALEN]; bool bWithCcxVerNum; u8 bss_ccx_ver_number; diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index c29efa3eef6fe..19cb717df3bbd 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1818,14 +1818,14 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee, network->ccx_rm_enable = true; else network->ccx_rm_enable = false; - network->MBssidMask = network->CcxRmState[1] & 0x07; - if (network->MBssidMask != 0) { + network->mb_ssid_mask = network->CcxRmState[1] & 0x07; + if (network->mb_ssid_mask != 0) { network->bMBssidValid = true; - network->MBssidMask = 0xff << - (network->MBssidMask); + network->mb_ssid_mask = 0xff << + (network->mb_ssid_mask); ether_addr_copy(network->mb_ssid, network->bssid); - network->mb_ssid[5] &= network->MBssidMask; + network->mb_ssid[5] &= network->mb_ssid_mask; } else { network->bMBssidValid = false; } @@ -2349,7 +2349,7 @@ static inline void update_network(struct rtllib_device *ieee, dst->ckip_supported = src->ckip_supported; memcpy(dst->CcxRmState, src->CcxRmState, 2); dst->ccx_rm_enable = src->ccx_rm_enable; - dst->MBssidMask = src->MBssidMask; + dst->mb_ssid_mask = src->mb_ssid_mask; dst->bMBssidValid = src->bMBssidValid; memcpy(dst->mb_ssid, src->mb_ssid, 6); dst->bWithCcxVerNum = src->bWithCcxVerNum;