openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: vt6656: MACvSetKeyEntry remove camel case. 

camel case changes
pDevice -> priv
wKeyCtl -> key_ctl
uEntryIdx -> entry_idx
uKeyIdx -> key_idx
pbyAddr -> addr
wOffset -> offset

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-05-26 13:58:59 +01:00 committed by Greg Kroah-Hartman
parent 954e8142a5
commit 39dd526e51
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/staging/vt6656/mac.c
View File

@ -122,21 +122,21 @@ void MACvDisableKeyEntry(struct vnt_private *priv, u8 entry_idx)
* Return Value: none * Return Value: none
* *
*/ */
void MACvSetKeyEntry(struct vnt_private *pDevice, u16 wKeyCtl, u32 uEntryIdx, void MACvSetKeyEntry(struct vnt_private *priv, u16 key_ctl, u32 entry_idx,
u32 uKeyIdx, u8 *pbyAddr, u8 *key) u32 key_idx, u8 *addr, u8 *key)
{ {
struct vnt_mac_set_key set_key; struct vnt_mac_set_key set_key;
u16 wOffset; u16 offset;
if (pDevice->byLocalID <= MAC_REVISION_A1) if (priv->byLocalID <= MAC_REVISION_A1)
if (pDevice->vnt_mgmt.byCSSPK == KEY_CTL_CCMP) if (priv->vnt_mgmt.byCSSPK == KEY_CTL_CCMP)
return; return;
wOffset = MISCFIFO_KEYETRY0; offset = MISCFIFO_KEYETRY0;
wOffset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE); offset += (entry_idx * MISCFIFO_KEYENTRYSIZE);
set_key.u.write.key_ctl = cpu_to_le16(wKeyCtl); set_key.u.write.key_ctl = cpu_to_le16(key_ctl);
memcpy(set_key.u.write.addr, pbyAddr, ETH_ALEN); memcpy(set_key.u.write.addr, addr, ETH_ALEN);
/* swap over swap[0] and swap[1] to get correct write order */ /* swap over swap[0] and swap[1] to get correct write order */
swap(set_key.u.swap[0], set_key.u.swap[1]); swap(set_key.u.swap[0], set_key.u.swap[1]);
@ -145,10 +145,10 @@ void MACvSetKeyEntry(struct vnt_private *pDevice, u16 wKeyCtl, u32 uEntryIdx,
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
"offset %d key ctl %d set key %24ph\n", "offset %d key ctl %d set key %24ph\n",
wOffset, wKeyCtl, (u8 *)&set_key); offset, key_ctl, (u8 *)&set_key);
CONTROLnsRequestOut(pDevice, MESSAGE_TYPE_SETKEY, wOffset, CONTROLnsRequestOut(priv, MESSAGE_TYPE_SETKEY, offset,
(u16)uKeyIdx, sizeof(struct vnt_mac_set_key), (u8 *)&set_key); (u16)key_idx, sizeof(struct vnt_mac_set_key), (u8 *)&set_key);
} }
void MACvRegBitsOff(struct vnt_private *priv, u8 reg_ofs, u8 bits) void MACvRegBitsOff(struct vnt_private *priv, u8 reg_ofs, u8 bits)