From nobody Tue May 7 23:39:08 2024 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1641312717420387.16930445261164; Tue, 4 Jan 2022 08:11:57 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235187AbiADQL4 (ORCPT ); Tue, 4 Jan 2022 11:11:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232163AbiADQLz (ORCPT ); Tue, 4 Jan 2022 11:11:55 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04045C061761 for ; Tue, 4 Jan 2022 08:11:55 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id y22so150496404edq.2 for ; Tue, 04 Jan 2022 08:11:54 -0800 (PST) Received: from t470p.fritz.box (host-79-36-120-235.retail.telecomitalia.it. [79.36.120.235]) by smtp.gmail.com with ESMTPSA id k12sm3550102ejk.188.2022.01.04.08.11.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 08:11:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=asDbpD726++9h2NWpRwMXn46LyOsIqdfH+8xUdoIcPo=; b=V+0xjBoPkkw4NnmHG92NNshrD52K5YHzPWXXFYcSxf0ldk/QHhh726xS2k4i6Xuh8z mjqdwiGpRz/1dOpWvbR3RBavLhxUtP3sLthKJRj8nchNqRcQZGKvtXKbvLFZTyk7Wlk/ u1AQrr4EQcuq3gyFNMqQcZebV8F41n1vaCoTdxhXRAoaWYXgXAI/u3v2wZkxRW60zCrs FydKs85n9JmnCym7FzwRAcOyWNcgnU0Si9VEfey5Qdi8UU8vyeVsM5Z15tTKVXAUXJYR kVj3ldii3CFK/TWVFnsWuX7KRerzaJi/k96DT1MCgJ/ur+T9x88QYcQCYjlxKBSSGbQt 6CmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=asDbpD726++9h2NWpRwMXn46LyOsIqdfH+8xUdoIcPo=; b=44jFbt7AmjVVYAWXAZc4tauC+OzhCYgrgYuNW+Ki9dJfToTVHjDbtHzdenaAIAwqUC mN4UT6GB0onPNa/dIAzFqWyTFYV+j0ZHpk9qI5/rzyLMzCP89XdXJFQvmq2t7PDop/hL jO+gulrHD3DLOpWmKv1ZHKiWNbZ+Fd/YzmfwsYliq6YUkAEPtX+bvZCYp//cAJRqwjZb SUJR/vXEkoEcGz8RHPam2S5LEpgaJEpN5KQVMCR2gPUWoU7pZ0lpUqMDzhVP4BlBZ3Xn 9v6vQN34aTeceH7W3y0LQubFcM6P7013x5yeZ6X6KVhNPRK9HAECaucs7WWY4J76NF+3 amHw== X-Gm-Message-State: AOAM530tTRXrkzpSp82hTvqdM+40pac0k33lX6ICXKtvYviRL8DV6baX itivTLLGT0CUfcNDeYgvq+E= X-Google-Smtp-Source: ABdhPJzWHaiRZNBFs8T5XVsoFydsYK5BIXm1nxxNWhXRwCIG8zQscpAFT1gIHV/DDnRKbknGyLW+lw== X-Received: by 2002:a17:907:7816:: with SMTP id la22mr37630289ejc.180.1641312713608; Tue, 04 Jan 2022 08:11:53 -0800 (PST) From: Alberto Merciai Cc: alb3rt0.m3rciai@gmail.com, linuxfancy@googlegroups.com, Larry Finger , Phillip Potter , Greg Kroah-Hartman , Michael Straube , Martin Kaiser , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] staging: r8188eu: rename camelcase variable uintPeerChannel Date: Tue, 4 Jan 2022 17:09:39 +0100 Message-Id: <20220104160945.460113-1-alb3rt0.m3rciai@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1641312718684100001 Content-Type: text/plain; charset="utf-8" Rename camelcase hungarian notated variable uintPeerChannel into peer_channel. Signed-off-by: Alberto Merciai --- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 36 ++++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging= /r8188eu/os_dep/ioctl_linux.c index 67a8af79508f..41b457838a5b 100644 --- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c +++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c @@ -2998,7 +2998,7 @@ static int rtw_p2p_connect(struct net_device *dev, struct list_head *plist, *phead; struct __queue *queue =3D &pmlmepriv->scanned_queue; struct wlan_network *pnetwork =3D NULL; - uint uintPeerChannel =3D 0; + u32 peer_channel =3D 0; =20 /* Commented by Albert 20110304 */ /* The input data contains two informations. */ @@ -3028,7 +3028,7 @@ static int rtw_p2p_connect(struct net_device *dev, while (phead !=3D plist) { pnetwork =3D container_of(plist, struct wlan_network, list); if (!memcmp(pnetwork->network.MacAddress, peerMAC, ETH_ALEN)) { - uintPeerChannel =3D pnetwork->network.Configuration.DSConfig; + peer_channel =3D pnetwork->network.Configuration.DSConfig; break; } =20 @@ -3037,11 +3037,11 @@ static int rtw_p2p_connect(struct net_device *dev, =20 spin_unlock_bh(&pmlmepriv->scanned_queue.lock); =20 - if (uintPeerChannel) { + if (peer_channel) { memset(&pwdinfo->nego_req_info, 0x00, sizeof(struct tx_nego_req_info)); memset(&pwdinfo->groupid_info, 0x00, sizeof(struct group_id_info)); =20 - pwdinfo->nego_req_info.peer_channel_num[0] =3D uintPeerChannel; + pwdinfo->nego_req_info.peer_channel_num[0] =3D peer_channel; memcpy(pwdinfo->nego_req_info.peerDevAddr, pnetwork->network.MacAddress,= ETH_ALEN); pwdinfo->nego_req_info.benable =3D true; =20 @@ -3076,7 +3076,7 @@ static int rtw_p2p_invite_req(struct net_device *dev, struct list_head *plist, *phead; struct __queue *queue =3D &pmlmepriv->scanned_queue; struct wlan_network *pnetwork =3D NULL; - uint uintPeerChannel =3D 0; + uint peer_channel =3D 0; u8 attr_content[50] =3D {0x00}; u8 *p2pie; uint p2pielen =3D 0, attr_contentlen =3D 0; @@ -3132,13 +3132,13 @@ static int rtw_p2p_invite_req(struct net_device *de= v, if (rtw_get_p2p_attr_content(p2pie, p2pielen, P2P_ATTR_DEVICE_ID, attr_= content, &attr_contentlen)) { /* Handle the P2P Device ID attribute of Beacon first */ if (!memcmp(attr_content, pinvite_req_info->peer_macaddr, ETH_ALEN)) { - uintPeerChannel =3D pnetwork->network.Configuration.DSConfig; + peer_channel =3D pnetwork->network.Configuration.DSConfig; break; } } else if (rtw_get_p2p_attr_content(p2pie, p2pielen, P2P_ATTR_DEVICE_IN= FO, attr_content, &attr_contentlen)) { /* Handle the P2P Device Info attribute of probe response */ if (!memcmp(attr_content, pinvite_req_info->peer_macaddr, ETH_ALEN)) { - uintPeerChannel =3D pnetwork->network.Configuration.DSConfig; + peer_channel =3D pnetwork->network.Configuration.DSConfig; break; } } @@ -3148,7 +3148,7 @@ static int rtw_p2p_invite_req(struct net_device *dev, =20 spin_unlock_bh(&pmlmepriv->scanned_queue.lock); =20 - if (uintPeerChannel) { + if (peer_channel) { /* Store the GO's bssid */ for (jj =3D 0, kk =3D 18; jj < ETH_ALEN; jj++, kk +=3D 3) pinvite_req_info->go_bssid[jj] =3D key_2char2num(extra[kk], extra[kk + = 1]); @@ -3157,12 +3157,12 @@ static int rtw_p2p_invite_req(struct net_device *de= v, pinvite_req_info->ssidlen =3D wrqu->data.length - 36; memcpy(pinvite_req_info->go_ssid, &extra[36], (u32)pinvite_req_info->ssi= dlen); pinvite_req_info->benable =3D true; - pinvite_req_info->peer_ch =3D uintPeerChannel; + pinvite_req_info->peer_ch =3D peer_channel; =20 rtw_p2p_set_pre_state(pwdinfo, rtw_p2p_state(pwdinfo)); rtw_p2p_set_state(pwdinfo, P2P_STATE_TX_INVITE_REQ); =20 - set_channel_bwmode(padapter, uintPeerChannel, HAL_PRIME_CHNL_OFFSET_DONT= _CARE, HT_CHANNEL_WIDTH_20); + set_channel_bwmode(padapter, peer_channel, HAL_PRIME_CHNL_OFFSET_DONT_CA= RE, HT_CHANNEL_WIDTH_20); =20 _set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT); =20 @@ -3215,7 +3215,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, struct list_head *plist, *phead; struct __queue *queue =3D &pmlmepriv->scanned_queue; struct wlan_network *pnetwork =3D NULL; - uint uintPeerChannel =3D 0; + uint peer_channel =3D 0; u8 attr_content[100] =3D {0x00}; u8 *p2pie; uint p2pielen =3D 0, attr_contentlen =3D 0; @@ -3265,7 +3265,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, plist =3D phead->next; =20 while (phead !=3D plist) { - if (uintPeerChannel !=3D 0) + if (peer_channel !=3D 0) break; =20 pnetwork =3D container_of(plist, struct wlan_network, list); @@ -3283,13 +3283,13 @@ static int rtw_p2p_prov_disc(struct net_device *dev, if (rtw_get_p2p_attr_content(p2pie, p2pielen, P2P_ATTR_DEVICE_ID, attr= _content, &attr_contentlen)) { /* Handle the P2P Device ID attribute of Beacon first */ if (!memcmp(attr_content, peerMAC, ETH_ALEN)) { - uintPeerChannel =3D pnetwork->network.Configuration.DSConfig; + peer_channel =3D pnetwork->network.Configuration.DSConfig; break; } } else if (rtw_get_p2p_attr_content(p2pie, p2pielen, P2P_ATTR_DEVICE_I= NFO, attr_content, &attr_contentlen)) { /* Handle the P2P Device Info attribute of probe response */ if (!memcmp(attr_content, peerMAC, ETH_ALEN)) { - uintPeerChannel =3D pnetwork->network.Configuration.DSConfig; + peer_channel =3D pnetwork->network.Configuration.DSConfig; break; } } @@ -3304,11 +3304,11 @@ static int rtw_p2p_prov_disc(struct net_device *dev, =20 spin_unlock_bh(&pmlmepriv->scanned_queue.lock); =20 - if (uintPeerChannel) { - DBG_88E("[%s] peer channel: %d!\n", __func__, uintPeerChannel); + if (peer_channel) { + DBG_88E("[%s] peer channel: %d!\n", __func__, peer_channel); memcpy(pwdinfo->tx_prov_disc_info.peerIFAddr, pnetwork->network.MacAddre= ss, ETH_ALEN); memcpy(pwdinfo->tx_prov_disc_info.peerDevAddr, peerMAC, ETH_ALEN); - pwdinfo->tx_prov_disc_info.peer_channel_num[0] =3D (u16)uintPeerChannel; + pwdinfo->tx_prov_disc_info.peer_channel_num[0] =3D (u16)peer_channel; pwdinfo->tx_prov_disc_info.benable =3D true; rtw_p2p_set_pre_state(pwdinfo, rtw_p2p_state(pwdinfo)); rtw_p2p_set_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ); @@ -3320,7 +3320,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, pwdinfo->tx_prov_disc_info.ssid.SsidLength =3D P2P_WILDCARD_SSID_LEN; } =20 - set_channel_bwmode(padapter, uintPeerChannel, HAL_PRIME_CHNL_OFFSET_DONT= _CARE, HT_CHANNEL_WIDTH_20); + set_channel_bwmode(padapter, peer_channel, HAL_PRIME_CHNL_OFFSET_DONT_CA= RE, HT_CHANNEL_WIDTH_20); =20 _set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT); =20 --=20 2.25.1