staging: vt6656: MACvDisableKeyEntry fix sizeof uEntryIdx to u8

Remove byData and change all callers to u8.

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 de2ae1d4643400856a1ed2f28dfe18528ff9e8c7..3edeb2f44f6a57c75d8a7eb159c0b48d48a94c80 100644 (file)
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -1150,7 +1150,7 @@ int iwctl_siwencode(struct net_device *dev, struct iw_request_info *info,
        struct iw_point *wrq = &wrqu->encoding;
        u32 dwKeyIndex = (u32)(wrq->flags & IW_ENCODE_INDEX);
        int ii;
-       int uu;
+       u8 uu;
        int rc = 0;
        int index = (wrq->flags & IW_ENCODE_INDEX);
 

diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c
index 0e14aabca736df3f4ef5c2e588243ad20d9f0b9a..a341eab8986b2c960d0ad55e5695e3bf81d71022 100644 (file)
--- a/drivers/staging/vt6656/mac.c
+++ b/drivers/staging/vt6656/mac.c
@@ -102,19 +102,15 @@ void MACvSetBBType(struct vnt_private *priv, u8 type)
  * Return Value: none
  *
  */
-void MACvDisableKeyEntry(struct vnt_private *pDevice, u32 uEntryIdx)
+void MACvDisableKeyEntry(struct vnt_private *pDevice, u8 uEntryIdx)
 {
-       u8 byData;
-
-    byData = (u8) uEntryIdx;
-
     //issue write misc fifo command to device
     CONTROLnsRequestOut(pDevice,
                         MESSAGE_TYPE_CLRKEYENTRY,
                         0,
                         0,
-                        1,
-                        &byData
+                       sizeof(uEntryIdx),
+                       &uEntryIdx
                         );
 }
 

diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h
index 4053e431ef99a3c73e23d38a1c74a9577a9d12a5..2084d4b1e532632aa473365df1b9a3defce8e213 100644 (file)
--- a/drivers/staging/vt6656/mac.h
+++ b/drivers/staging/vt6656/mac.h
@@ -406,7 +406,7 @@
 void MACvWriteMultiAddr(struct vnt_private *, u64);
 void MACbShutdown(struct vnt_private *);
 void MACvSetBBType(struct vnt_private *, u8);
-void MACvDisableKeyEntry(struct vnt_private *, u32);
+void MACvDisableKeyEntry(struct vnt_private *, u8);
 void MACvSetKeyEntry(struct vnt_private *, u16, u32, u32, u8 *, u32 *);
 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 09e444d8aceb8859989a395c2f1e6c3ad6d2240c..ed04804d1d50e093710c0c8816acf73dc9623b62 100644 (file)
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -984,7 +984,7 @@ static int device_close(struct net_device *dev)
 {
        struct vnt_private *pDevice = netdev_priv(dev);
        struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
-       int uu;
+       u8 uu;
 
        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_close1\n");
     if (pDevice == NULL)

diff --git a/drivers/staging/vt6656/wpactl.c b/drivers/staging/vt6656/wpactl.c
index b6885a91d1a455f36c323fcdcd48e039a28d3738..587e1117b8c7b5687b7535505a76d284e4a6d06b 100644 (file)
--- a/drivers/staging/vt6656/wpactl.c
+++ b/drivers/staging/vt6656/wpactl.c
@@ -66,7 +66,7 @@ int wpa_set_keys(struct vnt_private *pDevice, void *ctx)
        u64 KeyRSC;
        u8 byKeyDecMode = KEY_CTL_WEP;
        int ret = 0;
-       int uu;
+       u8 uu;
        int ii;
 
        if (param->u.wpa_key.alg_name > WPA_ALG_CCMP)