Commit 9190c4d2 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: MACvDisableKeyEntry fix sizeof uEntryIdx to u8

Remove byData and change all callers to u8.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bee7b68a
...@@ -1150,7 +1150,7 @@ int iwctl_siwencode(struct net_device *dev, struct iw_request_info *info, ...@@ -1150,7 +1150,7 @@ int iwctl_siwencode(struct net_device *dev, struct iw_request_info *info,
struct iw_point *wrq = &wrqu->encoding; struct iw_point *wrq = &wrqu->encoding;
u32 dwKeyIndex = (u32)(wrq->flags & IW_ENCODE_INDEX); u32 dwKeyIndex = (u32)(wrq->flags & IW_ENCODE_INDEX);
int ii; int ii;
int uu; u8 uu;
int rc = 0; int rc = 0;
int index = (wrq->flags & IW_ENCODE_INDEX); int index = (wrq->flags & IW_ENCODE_INDEX);
......
...@@ -102,19 +102,15 @@ void MACvSetBBType(struct vnt_private *priv, u8 type) ...@@ -102,19 +102,15 @@ void MACvSetBBType(struct vnt_private *priv, u8 type)
* Return Value: none * 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 //issue write misc fifo command to device
CONTROLnsRequestOut(pDevice, CONTROLnsRequestOut(pDevice,
MESSAGE_TYPE_CLRKEYENTRY, MESSAGE_TYPE_CLRKEYENTRY,
0, 0,
0, 0,
1, sizeof(uEntryIdx),
&byData &uEntryIdx
); );
} }
......
...@@ -406,7 +406,7 @@ ...@@ -406,7 +406,7 @@
void MACvWriteMultiAddr(struct vnt_private *, u64); void MACvWriteMultiAddr(struct vnt_private *, u64);
void MACbShutdown(struct vnt_private *); void MACbShutdown(struct vnt_private *);
void MACvSetBBType(struct vnt_private *, u8); 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 MACvSetKeyEntry(struct vnt_private *, u16, u32, u32, u8 *, u32 *);
void MACvRegBitsOff(struct vnt_private *, u8, u8); void MACvRegBitsOff(struct vnt_private *, u8, u8);
void MACvRegBitsOn(struct vnt_private *, u8, u8); void MACvRegBitsOn(struct vnt_private *, u8, u8);
......
...@@ -984,7 +984,7 @@ static int device_close(struct net_device *dev) ...@@ -984,7 +984,7 @@ static int device_close(struct net_device *dev)
{ {
struct vnt_private *pDevice = netdev_priv(dev); struct vnt_private *pDevice = netdev_priv(dev);
struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
int uu; u8 uu;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_close1\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_close1\n");
if (pDevice == NULL) if (pDevice == NULL)
......
...@@ -66,7 +66,7 @@ int wpa_set_keys(struct vnt_private *pDevice, void *ctx) ...@@ -66,7 +66,7 @@ int wpa_set_keys(struct vnt_private *pDevice, void *ctx)
u64 KeyRSC; u64 KeyRSC;
u8 byKeyDecMode = KEY_CTL_WEP; u8 byKeyDecMode = KEY_CTL_WEP;
int ret = 0; int ret = 0;
int uu; u8 uu;
int ii; int ii;
if (param->u.wpa_key.alg_name > WPA_ALG_CCMP) if (param->u.wpa_key.alg_name > WPA_ALG_CCMP)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment