diff options
| author | Jim Lieb <lieb@canonical.com> | 2009-08-12 14:54:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:08 -0700 |
| commit | 51b6d9c299f10780b3093d3748257ecc4ae7340d (patch) | |
| tree | 9dee0d32ff56c2bd89ae63a9e187b9e0fb0a1fc5 /drivers/staging/vt6655/dpc.c | |
| parent | a7ad322a46663755718a214a9a34e5cfe64d07f7 (diff) | |
| download | kernel_samsung_smdk4412-51b6d9c299f10780b3093d3748257ecc4ae7340d.zip kernel_samsung_smdk4412-51b6d9c299f10780b3093d3748257ecc4ae7340d.tar.gz kernel_samsung_smdk4412-51b6d9c299f10780b3093d3748257ecc4ae7340d.tar.bz2 | |
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/dpc.c')
| -rw-r--r-- | drivers/staging/vt6655/dpc.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c index aaae1e6..fa32229 100644 --- a/drivers/staging/vt6655/dpc.c +++ b/drivers/staging/vt6655/dpc.c @@ -45,7 +45,6 @@ #include "bssdb.h" #include "mac.h" #include "baseband.h" -#include "umem.h" #include "michael.h" #include "tkip.h" #include "tcrc.h" @@ -930,7 +929,7 @@ device_receive_frame ( RSC = dwRxTSC47_16; RSC <<= 16; RSC += wRxTSC15_0; - MEMvCopy(&(pKey->KeyRSC), &RSC, sizeof(QWORD)); + memcpy(&(pKey->KeyRSC), &RSC, sizeof(QWORD)); if ( (pDevice->sMgmtObj.eCurrMode == WMAC_MODE_ESS_STA) && (pDevice->sMgmtObj.eCurrState == WMAC_STATE_ASSOC)) { @@ -1263,8 +1262,8 @@ static BOOL s_bHandleRxEncryption ( // 2. WEP 256 PayloadLen -= (WLAN_HDR_ADDR3_LEN + 4 + 4); // 24 is 802.11 header,4 is IV, 4 is crc - MEMvCopy(pDevice->abyPRNG, pbyIV, 3); - MEMvCopy(pDevice->abyPRNG + 3, pKey->abyKey, pKey->uKeyLength); + memcpy(pDevice->abyPRNG, pbyIV, 3); + memcpy(pDevice->abyPRNG + 3, pKey->abyKey, pKey->uKeyLength); rc4_init(&pDevice->SBox, pDevice->abyPRNG, pKey->uKeyLength + 3); rc4_encrypt(&pDevice->SBox, pbyIV+4, pbyIV+4, PayloadLen); @@ -1373,8 +1372,8 @@ static BOOL s_bHostWepRxEncryption ( // 3. NotOnFly PayloadLen -= (WLAN_HDR_ADDR3_LEN + 4 + 4); // 24 is 802.11 header,4 is IV, 4 is crc - MEMvCopy(pDevice->abyPRNG, pbyIV, 3); - MEMvCopy(pDevice->abyPRNG + 3, pKey->abyKey, pKey->uKeyLength); + memcpy(pDevice->abyPRNG, pbyIV, 3); + memcpy(pDevice->abyPRNG + 3, pKey->abyKey, pKey->uKeyLength); rc4_init(&pDevice->SBox, pDevice->abyPRNG, pKey->uKeyLength + 3); rc4_encrypt(&pDevice->SBox, pbyIV+4, pbyIV+4, PayloadLen); |