diff options
| author | Malcolm Priestley | 2014-05-31 12:50:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-06-20 00:57:37 +0200 |
| commit | a7a93e325157fc7571b8e6614c99c12c258002e0 (patch) | |
| tree | 2bc5685d27c8faafbbb8181cfa3af22477c084a9 | |
| parent | staging: vt6656: rename MACvDisableKeyEntry to vnt_mac_disable_keyentry (diff) | |
| download | kernel-qcow2-linux-a7a93e325157fc7571b8e6614c99c12c258002e0.tar.gz kernel-qcow2-linux-a7a93e325157fc7571b8e6614c99c12c258002e0.tar.xz kernel-qcow2-linux-a7a93e325157fc7571b8e6614c99c12c258002e0.zip | |
staging: vt6656: rename MACvSetKeyEntry to vnt_mac_set_keyentry
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/vt6656/key.c | 12 | ||||
| -rw-r--r-- | drivers/staging/vt6656/mac.c | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/mac.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c index 4b08654cc439..33e3e5aa76ac 100644 --- a/drivers/staging/vt6656/key.c +++ b/drivers/staging/vt6656/key.c @@ -238,8 +238,8 @@ int KeybSetKey(struct vnt_private *pDevice, PSKeyManagement pTable, pKey->abyKey[15] |= 0x80; } - MACvSetKeyEntry(pDevice, pTable->KeyTable[i].wKeyCtl, i, uKeyIdx, - pbyBSSID, pKey->abyKey); + vnt_mac_set_keyentry(pDevice, pTable->KeyTable[i].wKeyCtl, i, + uKeyIdx, pbyBSSID, pKey->abyKey); if ((dwKeyIndex & USE_KEYRSC) == 0) pKey->KeyRSC = 0; /* RSC set by NIC */ @@ -308,7 +308,7 @@ int KeybSetKey(struct vnt_private *pDevice, PSKeyManagement pTable, 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); if ((dwKeyIndex & USE_KEYRSC) == 0) @@ -604,7 +604,7 @@ int KeybSetDefaultKey(struct vnt_private *pDevice, PSKeyManagement pTable, 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, pTable->KeyTable[MAX_KEY_TABLE-1].abyBSSID, pKey->abyKey); @@ -700,8 +700,8 @@ int KeybSetAllGroupKey(struct vnt_private *pDevice, PSKeyManagement pTable, pKey->abyKey[15] |= 0x80; } - MACvSetKeyEntry(pDevice, pTable->KeyTable[i].wKeyCtl, i, uKeyIdx, - pTable->KeyTable[i].abyBSSID, pKey->abyKey); + vnt_mac_set_keyentry(pDevice, pTable->KeyTable[i].wKeyCtl, i, + uKeyIdx, pTable->KeyTable[i].abyBSSID, pKey->abyKey); if ((dwKeyIndex & USE_KEYRSC) == 0) pKey->KeyRSC = 0; /* RSC set by NIC */ diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c index fe6b4ace408b..2d5121ab6d6d 100644 --- a/drivers/staging/vt6656/mac.c +++ b/drivers/staging/vt6656/mac.c @@ -119,7 +119,7 @@ void vnt_mac_disable_keyentry(struct vnt_private *priv, u8 entry_idx) * 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) { struct vnt_mac_set_key set_key; diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h index a808794abbe9..331c75cd62ae 100644 --- a/drivers/staging/vt6656/mac.h +++ b/drivers/staging/vt6656/mac.h @@ -418,7 +418,7 @@ void vnt_mac_set_filter(struct vnt_private *, u64); void vnt_mac_shutdown(struct vnt_private *); void vnt_mac_set_bb_type(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 MACvRegBitsOn(struct vnt_private *, u8, u8); void MACvWriteWord(struct vnt_private *, u8, u16); |