summaryrefslogtreecommitdiff
path: root/drivers/staging/vt6655/ioctl.c
diff options
context:
space:
mode:
authorJim Lieb <lieb@canonical.com>2009-08-12 21:54:10 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 19:02:08 (GMT)
commit51b6d9c299f10780b3093d3748257ecc4ae7340d (patch)
tree9dee0d32ff56c2bd89ae63a9e187b9e0fb0a1fc5 /drivers/staging/vt6655/ioctl.c
parenta7ad322a46663755718a214a9a34e5cfe64d07f7 (diff)
downloadlinux-fsl-qoriq-51b6d9c299f10780b3093d3748257ecc4ae7340d.tar.xz
Staging: vt665x: Remove umem.h Part 1
Remove references to umem.h macros and refer directly to memcpy functions. Delete the include file. Signed-off-by: Jim Lieb <lieb@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655/ioctl.c')
-rw-r--r--drivers/staging/vt6655/ioctl.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/vt6655/ioctl.c b/drivers/staging/vt6655/ioctl.c
index 47a5ff8..fc9cbe0 100644
--- a/drivers/staging/vt6655/ioctl.c
+++ b/drivers/staging/vt6655/ioctl.c
@@ -35,7 +35,6 @@
#include "mac.h"
#include "card.h"
#include "hostap.h"
-#include "umem.h"
#include "wpactl.h"
#include "rf.h"
@@ -726,8 +725,8 @@ vConfigWEPKey (
int ii;
- ZERO_MEMORY(&pDevice->abyWepKey[dwKeyIndex][0], WLAN_WEPMAX_KEYLEN);
- MEMvCopy(&pDevice->abyWepKey[dwKeyIndex][0], pbyKey, uKeyLength);
+ memset(&pDevice->abyWepKey[dwKeyIndex][0], 0, WLAN_WEPMAX_KEYLEN);
+ memcpy(&pDevice->abyWepKey[dwKeyIndex][0], pbyKey, uKeyLength);
pDevice->bWepKeyAvailable[dwKeyIndex] = TRUE;
pDevice->auWepKeyLength[dwKeyIndex] = uKeyLength;