From: Tree Davies Date: Tue, 21 May 2024 03:16:53 +0000 (-0700) Subject: Staging: rtl8192e: Rename variable MBssid X-Git-Tag: v6.11-rc1~101^2~120 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb003eab39eee4bd370abc4797b382876c8b80f7;p=thirdparty%2Flinux.git Staging: rtl8192e: Rename variable MBssid Rename variable MBssid to mb_ssid 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-7-tdavies@darkphysics.net Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index ce0cd1f557c30..7f1c2f49227e4 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -916,7 +916,7 @@ struct rtllib_network { u8 CcxRmState[2]; bool bMBssidValid; u8 MBssidMask; - u8 MBssid[ETH_ALEN]; + u8 mb_ssid[ETH_ALEN]; bool bWithCcxVerNum; u8 bss_ccx_ver_number; /* These are network statistics */ diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index 4e7c491c0aaf9..c29efa3eef6fe 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1823,9 +1823,9 @@ static void rtllib_parse_mife_generic(struct rtllib_device *ieee, network->bMBssidValid = true; network->MBssidMask = 0xff << (network->MBssidMask); - ether_addr_copy(network->MBssid, + ether_addr_copy(network->mb_ssid, network->bssid); - network->MBssid[5] &= network->MBssidMask; + network->mb_ssid[5] &= network->MBssidMask; } else { network->bMBssidValid = false; } @@ -2351,7 +2351,7 @@ static inline void update_network(struct rtllib_device *ieee, dst->ccx_rm_enable = src->ccx_rm_enable; dst->MBssidMask = src->MBssidMask; dst->bMBssidValid = src->bMBssidValid; - memcpy(dst->MBssid, src->MBssid, 6); + memcpy(dst->mb_ssid, src->mb_ssid, 6); dst->bWithCcxVerNum = src->bWithCcxVerNum; dst->bss_ccx_ver_number = src->bss_ccx_ver_number; }