From cd731941a09c0c32c0faa2a8572164df71aa704b Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Sat, 31 May 2014 11:50:39 +0100 Subject: [PATCH] staging: vt6656: rename MACvDisableKeyEntry to vnt_mac_disable_keyentry Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/iwctl.c | 2 +- drivers/staging/vt6656/key.c | 1 - drivers/staging/vt6656/mac.c | 2 +- drivers/staging/vt6656/mac.h | 2 +- drivers/staging/vt6656/main_usb.c | 2 +- drivers/staging/vt6656/wpactl.c | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c index c43718d..b45af4a 100644 --- a/drivers/staging/vt6656/iwctl.c +++ b/drivers/staging/vt6656/iwctl.c @@ -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) { diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c index 38ea675..4b08654 100644 --- a/drivers/staging/vt6656/key.c +++ b/drivers/staging/vt6656/key.c @@ -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); } } diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c index 136c263..fe6b4ac 100644 --- a/drivers/staging/vt6656/mac.c +++ b/drivers/staging/vt6656/mac.c @@ -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); diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h index ac3d794..a808794 100644 --- a/drivers/staging/vt6656/mac.h +++ b/drivers/staging/vt6656/mac.h @@ -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); diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 11738dc..fea667f 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -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); diff --git a/drivers/staging/vt6656/wpactl.c b/drivers/staging/vt6656/wpactl.c index 0a06715..2b508be 100644 --- a/drivers/staging/vt6656/wpactl.c +++ b/drivers/staging/vt6656/wpactl.c @@ -80,7 +80,7 @@ int wpa_set_keys(struct vnt_private *pDevice, void *ctx) pDevice->byKeyIndex = 0; pDevice->bTransmitKey = false; for (uu=0; uu