Commit a7a93e32 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: rename MACvSetKeyEntry to vnt_mac_set_keyentry

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cd731941
...@@ -238,8 +238,8 @@ int KeybSetKey(struct vnt_private *pDevice, PSKeyManagement pTable, ...@@ -238,8 +238,8 @@ int KeybSetKey(struct vnt_private *pDevice, PSKeyManagement pTable,
pKey->abyKey[15] |= 0x80; pKey->abyKey[15] |= 0x80;
} }
MACvSetKeyEntry(pDevice, pTable->KeyTable[i].wKeyCtl, i, uKeyIdx, vnt_mac_set_keyentry(pDevice, pTable->KeyTable[i].wKeyCtl, i,
pbyBSSID, pKey->abyKey); uKeyIdx, pbyBSSID, pKey->abyKey);
if ((dwKeyIndex & USE_KEYRSC) == 0) if ((dwKeyIndex & USE_KEYRSC) == 0)
pKey->KeyRSC = 0; /* RSC set by NIC */ pKey->KeyRSC = 0; /* RSC set by NIC */
...@@ -308,7 +308,7 @@ int KeybSetKey(struct vnt_private *pDevice, PSKeyManagement pTable, ...@@ -308,7 +308,7 @@ int KeybSetKey(struct vnt_private *pDevice, PSKeyManagement pTable,
pKey->abyKey[15] |= 0x80; pKey->abyKey[15] |= 0x80;
} }
MACvSetKeyEntry(pDevice, pTable->KeyTable[j].wKeyCtl, j, uKeyIdx, vnt_mac_set_keyentry(pDevice, pTable->KeyTable[j].wKeyCtl, j, uKeyIdx,
pbyBSSID, pKey->abyKey); pbyBSSID, pKey->abyKey);
if ((dwKeyIndex & USE_KEYRSC) == 0) if ((dwKeyIndex & USE_KEYRSC) == 0)
...@@ -604,7 +604,7 @@ int KeybSetDefaultKey(struct vnt_private *pDevice, PSKeyManagement pTable, ...@@ -604,7 +604,7 @@ int KeybSetDefaultKey(struct vnt_private *pDevice, PSKeyManagement pTable,
pKey->abyKey[15] |= 0x80; pKey->abyKey[15] |= 0x80;
} }
MACvSetKeyEntry(pDevice, pTable->KeyTable[MAX_KEY_TABLE-1].wKeyCtl, vnt_mac_set_keyentry(pDevice, pTable->KeyTable[MAX_KEY_TABLE-1].wKeyCtl,
MAX_KEY_TABLE-1, uKeyIdx, MAX_KEY_TABLE-1, uKeyIdx,
pTable->KeyTable[MAX_KEY_TABLE-1].abyBSSID, pKey->abyKey); pTable->KeyTable[MAX_KEY_TABLE-1].abyBSSID, pKey->abyKey);
...@@ -700,8 +700,8 @@ int KeybSetAllGroupKey(struct vnt_private *pDevice, PSKeyManagement pTable, ...@@ -700,8 +700,8 @@ int KeybSetAllGroupKey(struct vnt_private *pDevice, PSKeyManagement pTable,
pKey->abyKey[15] |= 0x80; pKey->abyKey[15] |= 0x80;
} }
MACvSetKeyEntry(pDevice, pTable->KeyTable[i].wKeyCtl, i, uKeyIdx, vnt_mac_set_keyentry(pDevice, pTable->KeyTable[i].wKeyCtl, i,
pTable->KeyTable[i].abyBSSID, pKey->abyKey); uKeyIdx, pTable->KeyTable[i].abyBSSID, pKey->abyKey);
if ((dwKeyIndex & USE_KEYRSC) == 0) if ((dwKeyIndex & USE_KEYRSC) == 0)
pKey->KeyRSC = 0; /* RSC set by NIC */ pKey->KeyRSC = 0; /* RSC set by NIC */
......
...@@ -119,7 +119,7 @@ void vnt_mac_disable_keyentry(struct vnt_private *priv, u8 entry_idx) ...@@ -119,7 +119,7 @@ void vnt_mac_disable_keyentry(struct vnt_private *priv, u8 entry_idx)
* Return Value: none * Return Value: none
* *
*/ */
void MACvSetKeyEntry(struct vnt_private *priv, u16 key_ctl, u32 entry_idx, void vnt_mac_set_keyentry(struct vnt_private *priv, u16 key_ctl, u32 entry_idx,
u32 key_idx, u8 *addr, u8 *key) u32 key_idx, u8 *addr, u8 *key)
{ {
struct vnt_mac_set_key set_key; struct vnt_mac_set_key set_key;
......
...@@ -418,7 +418,7 @@ void vnt_mac_set_filter(struct vnt_private *, u64); ...@@ -418,7 +418,7 @@ void vnt_mac_set_filter(struct vnt_private *, u64);
void vnt_mac_shutdown(struct vnt_private *); void vnt_mac_shutdown(struct vnt_private *);
void vnt_mac_set_bb_type(struct vnt_private *, u8); void vnt_mac_set_bb_type(struct vnt_private *, u8);
void vnt_mac_disable_keyentry(struct vnt_private *, u8); void vnt_mac_disable_keyentry(struct vnt_private *, u8);
void MACvSetKeyEntry(struct vnt_private *, u16, u32, u32, u8 *, u8 *); void vnt_mac_set_keyentry(struct vnt_private *, u16, u32, u32, u8 *, u8 *);
void MACvRegBitsOff(struct vnt_private *, u8, u8); void MACvRegBitsOff(struct vnt_private *, u8, u8);
void MACvRegBitsOn(struct vnt_private *, u8, u8); void MACvRegBitsOn(struct vnt_private *, u8, u8);
void MACvWriteWord(struct vnt_private *, u8, u16); void MACvWriteWord(struct vnt_private *, u8, u16);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment