summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6656/mac.c
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2014-05-26 13:58:58 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-26 10:36:48 -0700
commit954e8142a5c251283cdaa7eaaa8bb9af1c5a4a52 (patch)
tree8ed8ea6ec28ddbab425a91af8c6be3ddb8e402d3 /drivers/staging/vt6656/mac.c
parentc1ad28a3995da1e8300d29ac01fd3757c8dfadfc (diff)
staging: vt6656: MACvSetKeyEntry change u32 pdwKey to u8 pointer
Change pdwKey u32 pointer to key u8 pointer. Callers are already u8 remove u32 pointer cast. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/mac.c')
-rw-r--r--drivers/staging/vt6656/mac.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c
index bc72144f0d21..a030c592cd3a 100644
--- a/drivers/staging/vt6656/mac.c
+++ b/drivers/staging/vt6656/mac.c
@@ -123,10 +123,9 @@ void MACvDisableKeyEntry(struct vnt_private *priv, u8 entry_idx)
*
*/
void MACvSetKeyEntry(struct vnt_private *pDevice, u16 wKeyCtl, u32 uEntryIdx,
- u32 uKeyIdx, u8 *pbyAddr, u32 *pdwKey)
+ u32 uKeyIdx, u8 *pbyAddr, u8 *key)
{
struct vnt_mac_set_key set_key;
- u8 *pbyKey = (u8 *)pdwKey;
u16 wOffset;
if (pDevice->byLocalID <= MAC_REVISION_A1)
@@ -142,7 +141,7 @@ void MACvSetKeyEntry(struct vnt_private *pDevice, u16 wKeyCtl, u32 uEntryIdx,
/* swap over swap[0] and swap[1] to get correct write order */
swap(set_key.u.swap[0], set_key.u.swap[1]);
- memcpy(set_key.key, pbyKey, WLAN_KEY_LEN_CCMP);
+ memcpy(set_key.key, key, WLAN_KEY_LEN_CCMP);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
"offset %d key ctl %d set key %24ph\n",