From: Camylla Goncalves Cantanheide <c.cantanheide@gmail.com>
To: gregkh@linuxfoundation.org, navid.emamdoost@gmail.com,
sylphrenadin@gmail.com, nishkadg.linux@gmail.com,
stephen@brennan.io, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org, lkcamp@lists.libreplanetbr.org
Subject: [PATCH 2/2] staging: rtl8192u: Renames variables in setKey function
Date: Mon, 13 Apr 2020 03:01:29 +0000 [thread overview]
Message-ID: <20200413030129.861-2-c.cantanheide@gmail.com> (raw)
In-Reply-To: <20200413030129.861-1-c.cantanheide@gmail.com>
Renames the local variables of the setKey
function, making them explicit.
Signed-off-by: Camylla Goncalves Cantanheide <c.cantanheide@gmail.com>
---
drivers/staging/rtl8192u/r8192U_core.c | 48 +++++++++++++-------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index 87c02aee3854..cc02c3b1eb91 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -4877,48 +4877,48 @@ void EnableHWSecurityConfig8192(struct net_device *dev)
write_nic_byte(dev, SECR, SECR_value);
}
-void setKey(struct net_device *dev, u8 entryno, u8 keyindex, u16 keytype,
- u8 *macaddr, u8 defaultkey, u32 *keycontent)
+void setKey(struct net_device *dev, u8 entry_no, u8 key_idx, u16 key_type,
+ u8 *mac_addr, u8 default_key, u32 *key_content)
{
- u32 target_command = CAM_CONTENT_COUNT * entryno | BIT(31) | BIT(16);
- u32 target_content = 0;
- u16 us_config = 0;
+ u32 cmd = CAM_CONTENT_COUNT * entry_no | BIT(31) | BIT(16);
+ u32 content = 0;
+ u16 config = 0;
u8 i;
- if (entryno >= TOTAL_CAM_ENTRY)
+ if (entry_no >= TOTAL_CAM_ENTRY)
RT_TRACE(COMP_ERR, "cam entry exceeds in %s\n", __func__);
RT_TRACE(COMP_SEC,
"====>to %s, dev:%p, EntryNo:%d, KeyIndex:%d, KeyType:%d, MacAddr%pM\n",
- __func__, dev, entryno, keyindex, keytype, macaddr);
+ __func__, dev, entry_no, key_idx, key_type, mac_addr);
- if (defaultkey)
- us_config |= BIT(15) | (keytype << 2);
+ if (default_key)
+ config |= BIT(15) | (key_type << 2);
else
- us_config |= BIT(15) | (keytype << 2) | keyindex;
+ config |= BIT(15) | (key_type << 2) | key_idx;
- target_content = macaddr[0] << 16 |
- macaddr[0] << 24 |
- (u32)us_config;
+ content = mac_addr[0] << 16 |
+ mac_addr[0] << 24 |
+ (u32)config;
- write_nic_dword(dev, WCAMI, target_content);
- write_nic_dword(dev, RWCAM, target_command++);
+ write_nic_dword(dev, WCAMI, content);
+ write_nic_dword(dev, RWCAM, cmd++);
/* MAC */
- target_content = macaddr[2] |
- macaddr[3] << 8 |
- macaddr[4] << 16 |
- macaddr[5] << 24;
- write_nic_dword(dev, WCAMI, target_content);
- write_nic_dword(dev, RWCAM, target_command++);
+ content = mac_addr[2] |
+ mac_addr[3] << 8 |
+ mac_addr[4] << 16 |
+ mac_addr[5] << 24;
+ write_nic_dword(dev, WCAMI, content);
+ write_nic_dword(dev, RWCAM, cmd++);
/* Key Material */
- if (!keycontent)
+ if (!key_content)
return;
for (i = 2; i < CAM_CONTENT_COUNT; i++) {
- write_nic_dword(dev, WCAMI, *keycontent++);
- write_nic_dword(dev, RWCAM, target_command++);
+ write_nic_dword(dev, WCAMI, *key_content++);
+ write_nic_dword(dev, RWCAM, cmd++);
}
}
--
2.20.1
next prev parent reply other threads:[~2020-04-13 3:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-13 3:01 [PATCH 1/2] staging: rtl8192u: Refactoring setKey function Camylla Goncalves Cantanheide
2020-04-13 3:01 ` Camylla Goncalves Cantanheide [this message]
2020-04-13 12:50 ` [PATCH 2/2] staging: rtl8192u: Renames variables in " Greg KH
2020-04-13 12:50 ` [PATCH 1/2] staging: rtl8192u: Refactoring " Greg KH
2020-04-13 15:39 ` Joe Perches
2020-04-14 12:33 ` Dan Carpenter
2020-04-14 16:01 ` Joe Perches
2020-04-14 18:32 ` Dan Carpenter
[not found] ` <CAG3pEr+huVACoP7sTMALYfE46dc+D8DdGPF0ky6EShd4eXD9eg@mail.gmail.com>
2020-04-15 3:09 ` Joe Perches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200413030129.861-2-c.cantanheide@gmail.com \
--to=c.cantanheide@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lkcamp@lists.libreplanetbr.org \
--cc=navid.emamdoost@gmail.com \
--cc=nishkadg.linux@gmail.com \
--cc=stephen@brennan.io \
--cc=sylphrenadin@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox