staging: vt6656: rename MACvDisableKeyEntry to vnt_mac_disable_keyentry

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index c43718d788c0bf70d7ef4ed51ea09c8c541c2080..b45af4acb18342178e059196e5ae5143ce0c785a 100644 (file)
--- 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 38ea67531d977aee080ec040272f94ec4ff04913..4b08654cc4393bb7448a4bc48054f1b7950f1e38 100644 (file)
--- 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 136c2637dcb3e05edabf303c9be9415c460b8592..fe6b4ace408b12a5dbf7ed23bedff9b278db15df 100644 (file)
--- 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 ac3d794e0021a0aa11964f5c23aaf08fe886c0cc..a808794abbe9beab8b233d25de7404030c17b205 100644 (file)
--- 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 11738dc4fb94f7b7d76cd2ed383b411856a550c3..fea667fd8914610088818024a1cbc07b56fb0329 100644 (file)
--- 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 0a067151eca596c9101dd7df88393db631b83eb2..2b508beaa2c2dff7788df7382906dd2b14c09836 100644 (file)
--- 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<MAX_KEY_TABLE; uu++) {
-                       MACvDisableKeyEntry(pDevice, uu);
+                       vnt_mac_disable_keyentry(pDevice, uu);
                }
                return ret;
        }