Commit cd731941 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: rename MACvDisableKeyEntry to vnt_mac_disable_keyentry 



Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 05089fbc

drivers/staging/vt6656/iwctl.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

drivers/staging/vt6656/key.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }

drivers/staging/vt6656/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/vt6656/mac.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/vt6656/main_usb.c

+1 −1
Original line number Diff line number Diff line
@@ -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);