redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: vt6656: rename MACvDisableKeyEntry to vnt_mac_disable_keyentry

Browse source 
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-31 11:50:39 +01:00 committed by Greg Kroah-Hartman
parent 05089fbc52
commit cd731941a0
6 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/vt6656/iwctl.c
View file

@ -1224,7 +1224,7 @@ int iwctl_siwencode(struct net_device *dev, struct iw_request_info *info,
pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled;
if (pDevice->flags & DEVICE_FLAGS_OPENED) {
for (uu = 0; uu < MAX_KEY_TABLE; uu++)
MACvDisableKeyEntry(pDevice, uu);
vnt_mac_disable_keyentry(pDevice, uu);
}
}
if (wrq->flags & IW_ENCODE_RESTRICTED) {

1
drivers/staging/vt6656/key.c
View file

@ -64,7 +64,6 @@ static void s_vCheckKeyTableValid(struct vnt_private *pDevice,
pTable->KeyTable[i].wKeyCtl = 0;
pTable->KeyTable[i].bSoftWEP = false;
pbyData[wLength++] = (u8) i;
//MACvDisableKeyEntry(pDevice, i);
}
}

2
drivers/staging/vt6656/mac.c
View file

@ -99,7 +99,7 @@ void vnt_mac_set_bb_type(struct vnt_private *priv, u8 type)
* Return Value: none
*
*/
void MACvDisableKeyEntry(struct vnt_private *priv, u8 entry_idx)
void vnt_mac_disable_keyentry(struct vnt_private *priv, u8 entry_idx)
{
vnt_control_out(priv, MESSAGE_TYPE_CLRKEYENTRY, 0, 0,
sizeof(entry_idx), &entry_idx);

2
drivers/staging/vt6656/mac.h
View file

@ -417,7 +417,7 @@ struct vnt_mac_set_key {
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 MACvDisableKeyEntry(struct vnt_private *, u8);
void vnt_mac_disable_keyentry(struct vnt_private *, u8);
void MACvSetKeyEntry(struct vnt_private *, u16, u32, u32, u8 *, u8 *);
void MACvRegBitsOff(struct vnt_private *, u8, u8);
void MACvRegBitsOn(struct vnt_private *, u8, u8);

2
drivers/staging/vt6656/main_usb.c
View file

@ -1000,7 +1000,7 @@ static int device_close(struct net_device *dev)
pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled;
for (uu = 0; uu < MAX_KEY_TABLE; uu++)
MACvDisableKeyEntry(pDevice,uu);
vnt_mac_disable_keyentry(pDevice, uu);
if ((pDevice->flags & DEVICE_FLAGS_UNPLUG) == false)
vnt_mac_shutdown(pDevice);

2
drivers/staging/vt6656/wpactl.c
View file

@ -80,7 +80,7 @@ int wpa_set_keys(struct vnt_private *pDevice, void *ctx)
pDevice->byKeyIndex = 0;
pDevice->bTransmitKey = false;
for (uu=0; uu<MAX_KEY_TABLE; uu++) {
MACvDisableKeyEntry(pDevice, uu);
vnt_mac_disable_keyentry(pDevice, uu);
}
return ret;
}