diff options
author | Jim Lieb <lieb@canonical.com> | 2009-08-12 17:54:10 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:02:08 -0400 |
commit | 51b6d9c299f10780b3093d3748257ecc4ae7340d (patch) | |
tree | 9dee0d32ff56c2bd89ae63a9e187b9e0fb0a1fc5 /drivers/staging/vt6655/rxtx.c | |
parent | a7ad322a46663755718a214a9a34e5cfe64d07f7 (diff) |
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/rxtx.c')
-rw-r--r-- | drivers/staging/vt6655/rxtx.c | 159 |
1 files changed, 79 insertions, 80 deletions
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index eb73fdb801a..0c5ff19db35 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c | |||
@@ -55,7 +55,6 @@ | |||
55 | #include "bssdb.h" | 55 | #include "bssdb.h" |
56 | #include "mac.h" | 56 | #include "mac.h" |
57 | #include "baseband.h" | 57 | #include "baseband.h" |
58 | #include "umem.h" | ||
59 | #include "michael.h" | 58 | #include "michael.h" |
60 | #include "tkip.h" | 59 | #include "tkip.h" |
61 | #include "tcrc.h" | 60 | #include "tcrc.h" |
@@ -242,16 +241,16 @@ s_vFillTxKey ( | |||
242 | 241 | ||
243 | if (pTransmitKey->byCipherSuite == KEY_CTL_WEP) { | 242 | if (pTransmitKey->byCipherSuite == KEY_CTL_WEP) { |
244 | if (pTransmitKey->uKeyLength == WLAN_WEP232_KEYLEN ){ | 243 | if (pTransmitKey->uKeyLength == WLAN_WEP232_KEYLEN ){ |
245 | MEMvCopy(pDevice->abyPRNG, (PBYTE)&(dwRevIVCounter), 3); | 244 | memcpy(pDevice->abyPRNG, (PBYTE)&(dwRevIVCounter), 3); |
246 | MEMvCopy(pDevice->abyPRNG+3, pTransmitKey->abyKey, pTransmitKey->uKeyLength); | 245 | memcpy(pDevice->abyPRNG+3, pTransmitKey->abyKey, pTransmitKey->uKeyLength); |
247 | } else { | 246 | } else { |
248 | MEMvCopy(pbyBuf, (PBYTE)&(dwRevIVCounter), 3); | 247 | memcpy(pbyBuf, (PBYTE)&(dwRevIVCounter), 3); |
249 | MEMvCopy(pbyBuf+3, pTransmitKey->abyKey, pTransmitKey->uKeyLength); | 248 | memcpy(pbyBuf+3, pTransmitKey->abyKey, pTransmitKey->uKeyLength); |
250 | if(pTransmitKey->uKeyLength == WLAN_WEP40_KEYLEN) { | 249 | if(pTransmitKey->uKeyLength == WLAN_WEP40_KEYLEN) { |
251 | MEMvCopy(pbyBuf+8, (PBYTE)&(dwRevIVCounter), 3); | 250 | memcpy(pbyBuf+8, (PBYTE)&(dwRevIVCounter), 3); |
252 | MEMvCopy(pbyBuf+11, pTransmitKey->abyKey, pTransmitKey->uKeyLength); | 251 | memcpy(pbyBuf+11, pTransmitKey->abyKey, pTransmitKey->uKeyLength); |
253 | } | 252 | } |
254 | MEMvCopy(pDevice->abyPRNG, pbyBuf, 16); | 253 | memcpy(pDevice->abyPRNG, pbyBuf, 16); |
255 | } | 254 | } |
256 | // Append IV after Mac Header | 255 | // Append IV after Mac Header |
257 | *pdwIV &= WEP_IV_MASK;//00000000 11111111 11111111 11111111 | 256 | *pdwIV &= WEP_IV_MASK;//00000000 11111111 11111111 11111111 |
@@ -268,9 +267,9 @@ s_vFillTxKey ( | |||
268 | } | 267 | } |
269 | TKIPvMixKey(pTransmitKey->abyKey, pDevice->abyCurrentNetAddr, | 268 | TKIPvMixKey(pTransmitKey->abyKey, pDevice->abyCurrentNetAddr, |
270 | pTransmitKey->wTSC15_0, pTransmitKey->dwTSC47_16, pDevice->abyPRNG); | 269 | pTransmitKey->wTSC15_0, pTransmitKey->dwTSC47_16, pDevice->abyPRNG); |
271 | MEMvCopy(pbyBuf, pDevice->abyPRNG, 16); | 270 | memcpy(pbyBuf, pDevice->abyPRNG, 16); |
272 | // Make IV | 271 | // Make IV |
273 | MEMvCopy(pdwIV, pDevice->abyPRNG, 3); | 272 | memcpy(pdwIV, pDevice->abyPRNG, 3); |
274 | 273 | ||
275 | *(pbyIVHead+3) = (BYTE)(((byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV | 274 | *(pbyIVHead+3) = (BYTE)(((byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV |
276 | // Append IV&ExtIV after Mac Header | 275 | // Append IV&ExtIV after Mac Header |
@@ -282,7 +281,7 @@ s_vFillTxKey ( | |||
282 | if (pTransmitKey->wTSC15_0 == 0) { | 281 | if (pTransmitKey->wTSC15_0 == 0) { |
283 | pTransmitKey->dwTSC47_16++; | 282 | pTransmitKey->dwTSC47_16++; |
284 | } | 283 | } |
285 | MEMvCopy(pbyBuf, pTransmitKey->abyKey, 16); | 284 | memcpy(pbyBuf, pTransmitKey->abyKey, 16); |
286 | 285 | ||
287 | // Make IV | 286 | // Make IV |
288 | *pdwIV = 0; | 287 | *pdwIV = 0; |
@@ -294,7 +293,7 @@ s_vFillTxKey ( | |||
294 | //Fill MICHDR0 | 293 | //Fill MICHDR0 |
295 | *pMICHDR = 0x59; | 294 | *pMICHDR = 0x59; |
296 | *((PBYTE)(pMICHDR+1)) = 0; // TxPriority | 295 | *((PBYTE)(pMICHDR+1)) = 0; // TxPriority |
297 | MEMvCopy(pMICHDR+2, &(pMACHeader->abyAddr2[0]), 6); | 296 | memcpy(pMICHDR+2, &(pMACHeader->abyAddr2[0]), 6); |
298 | *((PBYTE)(pMICHDR+8)) = HIBYTE(HIWORD(pTransmitKey->dwTSC47_16)); | 297 | *((PBYTE)(pMICHDR+8)) = HIBYTE(HIWORD(pTransmitKey->dwTSC47_16)); |
299 | *((PBYTE)(pMICHDR+9)) = LOBYTE(HIWORD(pTransmitKey->dwTSC47_16)); | 298 | *((PBYTE)(pMICHDR+9)) = LOBYTE(HIWORD(pTransmitKey->dwTSC47_16)); |
300 | *((PBYTE)(pMICHDR+10)) = HIBYTE(LOWORD(pTransmitKey->dwTSC47_16)); | 299 | *((PBYTE)(pMICHDR+10)) = HIBYTE(LOWORD(pTransmitKey->dwTSC47_16)); |
@@ -312,18 +311,18 @@ s_vFillTxKey ( | |||
312 | *((PBYTE)(pMICHDR+17)) = 22; // HLEN[7:0] | 311 | *((PBYTE)(pMICHDR+17)) = 22; // HLEN[7:0] |
313 | } | 312 | } |
314 | wValue = cpu_to_le16(pMACHeader->wFrameCtl & 0xC78F); | 313 | wValue = cpu_to_le16(pMACHeader->wFrameCtl & 0xC78F); |
315 | MEMvCopy(pMICHDR+18, (PBYTE)&wValue, 2); // MSKFRACTL | 314 | memcpy(pMICHDR+18, (PBYTE)&wValue, 2); // MSKFRACTL |
316 | MEMvCopy(pMICHDR+20, &(pMACHeader->abyAddr1[0]), 6); | 315 | memcpy(pMICHDR+20, &(pMACHeader->abyAddr1[0]), 6); |
317 | MEMvCopy(pMICHDR+26, &(pMACHeader->abyAddr2[0]), 6); | 316 | memcpy(pMICHDR+26, &(pMACHeader->abyAddr2[0]), 6); |
318 | 317 | ||
319 | //Fill MICHDR2 | 318 | //Fill MICHDR2 |
320 | MEMvCopy(pMICHDR+32, &(pMACHeader->abyAddr3[0]), 6); | 319 | memcpy(pMICHDR+32, &(pMACHeader->abyAddr3[0]), 6); |
321 | wValue = pMACHeader->wSeqCtl; | 320 | wValue = pMACHeader->wSeqCtl; |
322 | wValue &= 0x000F; | 321 | wValue &= 0x000F; |
323 | wValue = cpu_to_le16(wValue); | 322 | wValue = cpu_to_le16(wValue); |
324 | MEMvCopy(pMICHDR+38, (PBYTE)&wValue, 2); // MSKSEQCTL | 323 | memcpy(pMICHDR+38, (PBYTE)&wValue, 2); // MSKSEQCTL |
325 | if (pDevice->bLongHeader) { | 324 | if (pDevice->bLongHeader) { |
326 | MEMvCopy(pMICHDR+40, &(pMACHeader->abyAddr4[0]), 6); | 325 | memcpy(pMICHDR+40, &(pMACHeader->abyAddr4[0]), 6); |
327 | } | 326 | } |
328 | } | 327 | } |
329 | } | 328 | } |
@@ -902,16 +901,16 @@ s_vFillRTSHead ( | |||
902 | pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4 | 901 | pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4 |
903 | if ((pDevice->eOPMode == OP_MODE_ADHOC) || | 902 | if ((pDevice->eOPMode == OP_MODE_ADHOC) || |
904 | (pDevice->eOPMode == OP_MODE_AP)) { | 903 | (pDevice->eOPMode == OP_MODE_AP)) { |
905 | MEMvCopy(&(pBuf->Data.abyRA[0]), &(psEthHeader->abyDstAddr[0]), U_ETHER_ADDR_LEN); | 904 | memcpy(&(pBuf->Data.abyRA[0]), &(psEthHeader->abyDstAddr[0]), U_ETHER_ADDR_LEN); |
906 | } | 905 | } |
907 | else { | 906 | else { |
908 | MEMvCopy(&(pBuf->Data.abyRA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); | 907 | memcpy(&(pBuf->Data.abyRA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); |
909 | } | 908 | } |
910 | if (pDevice->eOPMode == OP_MODE_AP) { | 909 | if (pDevice->eOPMode == OP_MODE_AP) { |
911 | MEMvCopy(&(pBuf->Data.abyTA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); | 910 | memcpy(&(pBuf->Data.abyTA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); |
912 | } | 911 | } |
913 | else { | 912 | else { |
914 | MEMvCopy(&(pBuf->Data.abyTA[0]), &(psEthHeader->abySrcAddr[0]), U_ETHER_ADDR_LEN); | 913 | memcpy(&(pBuf->Data.abyTA[0]), &(psEthHeader->abySrcAddr[0]), U_ETHER_ADDR_LEN); |
915 | } | 914 | } |
916 | } | 915 | } |
917 | else { | 916 | else { |
@@ -940,17 +939,17 @@ s_vFillRTSHead ( | |||
940 | 939 | ||
941 | if ((pDevice->eOPMode == OP_MODE_ADHOC) || | 940 | if ((pDevice->eOPMode == OP_MODE_ADHOC) || |
942 | (pDevice->eOPMode == OP_MODE_AP)) { | 941 | (pDevice->eOPMode == OP_MODE_AP)) { |
943 | MEMvCopy(&(pBuf->Data.abyRA[0]), &(psEthHeader->abyDstAddr[0]), U_ETHER_ADDR_LEN); | 942 | memcpy(&(pBuf->Data.abyRA[0]), &(psEthHeader->abyDstAddr[0]), U_ETHER_ADDR_LEN); |
944 | } | 943 | } |
945 | else { | 944 | else { |
946 | MEMvCopy(&(pBuf->Data.abyRA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); | 945 | memcpy(&(pBuf->Data.abyRA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); |
947 | } | 946 | } |
948 | 947 | ||
949 | if (pDevice->eOPMode == OP_MODE_AP) { | 948 | if (pDevice->eOPMode == OP_MODE_AP) { |
950 | MEMvCopy(&(pBuf->Data.abyTA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); | 949 | memcpy(&(pBuf->Data.abyTA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); |
951 | } | 950 | } |
952 | else { | 951 | else { |
953 | MEMvCopy(&(pBuf->Data.abyTA[0]), &(psEthHeader->abySrcAddr[0]), U_ETHER_ADDR_LEN); | 952 | memcpy(&(pBuf->Data.abyTA[0]), &(psEthHeader->abySrcAddr[0]), U_ETHER_ADDR_LEN); |
954 | } | 953 | } |
955 | 954 | ||
956 | } // if (byFBOption == AUTO_FB_NONE) | 955 | } // if (byFBOption == AUTO_FB_NONE) |
@@ -971,17 +970,17 @@ s_vFillRTSHead ( | |||
971 | 970 | ||
972 | if ((pDevice->eOPMode == OP_MODE_ADHOC) || | 971 | if ((pDevice->eOPMode == OP_MODE_ADHOC) || |
973 | (pDevice->eOPMode == OP_MODE_AP)) { | 972 | (pDevice->eOPMode == OP_MODE_AP)) { |
974 | MEMvCopy(&(pBuf->Data.abyRA[0]), &(psEthHeader->abyDstAddr[0]), U_ETHER_ADDR_LEN); | 973 | memcpy(&(pBuf->Data.abyRA[0]), &(psEthHeader->abyDstAddr[0]), U_ETHER_ADDR_LEN); |
975 | } | 974 | } |
976 | else { | 975 | else { |
977 | MEMvCopy(&(pBuf->Data.abyRA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); | 976 | memcpy(&(pBuf->Data.abyRA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); |
978 | } | 977 | } |
979 | 978 | ||
980 | if (pDevice->eOPMode == OP_MODE_AP) { | 979 | if (pDevice->eOPMode == OP_MODE_AP) { |
981 | MEMvCopy(&(pBuf->Data.abyTA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); | 980 | memcpy(&(pBuf->Data.abyTA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); |
982 | } | 981 | } |
983 | else { | 982 | else { |
984 | MEMvCopy(&(pBuf->Data.abyTA[0]), &(psEthHeader->abySrcAddr[0]), U_ETHER_ADDR_LEN); | 983 | memcpy(&(pBuf->Data.abyTA[0]), &(psEthHeader->abySrcAddr[0]), U_ETHER_ADDR_LEN); |
985 | } | 984 | } |
986 | 985 | ||
987 | } | 986 | } |
@@ -1002,16 +1001,16 @@ s_vFillRTSHead ( | |||
1002 | 1001 | ||
1003 | if ((pDevice->eOPMode == OP_MODE_ADHOC) || | 1002 | if ((pDevice->eOPMode == OP_MODE_ADHOC) || |
1004 | (pDevice->eOPMode == OP_MODE_AP)) { | 1003 | (pDevice->eOPMode == OP_MODE_AP)) { |
1005 | MEMvCopy(&(pBuf->Data.abyRA[0]), &(psEthHeader->abyDstAddr[0]), U_ETHER_ADDR_LEN); | 1004 | memcpy(&(pBuf->Data.abyRA[0]), &(psEthHeader->abyDstAddr[0]), U_ETHER_ADDR_LEN); |
1006 | } | 1005 | } |
1007 | else { | 1006 | else { |
1008 | MEMvCopy(&(pBuf->Data.abyRA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); | 1007 | memcpy(&(pBuf->Data.abyRA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); |
1009 | } | 1008 | } |
1010 | if (pDevice->eOPMode == OP_MODE_AP) { | 1009 | if (pDevice->eOPMode == OP_MODE_AP) { |
1011 | MEMvCopy(&(pBuf->Data.abyTA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); | 1010 | memcpy(&(pBuf->Data.abyTA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); |
1012 | } | 1011 | } |
1013 | else { | 1012 | else { |
1014 | MEMvCopy(&(pBuf->Data.abyTA[0]), &(psEthHeader->abySrcAddr[0]), U_ETHER_ADDR_LEN); | 1013 | memcpy(&(pBuf->Data.abyTA[0]), &(psEthHeader->abySrcAddr[0]), U_ETHER_ADDR_LEN); |
1015 | } | 1014 | } |
1016 | } | 1015 | } |
1017 | } | 1016 | } |
@@ -1031,17 +1030,17 @@ s_vFillRTSHead ( | |||
1031 | 1030 | ||
1032 | if ((pDevice->eOPMode == OP_MODE_ADHOC) || | 1031 | if ((pDevice->eOPMode == OP_MODE_ADHOC) || |
1033 | (pDevice->eOPMode == OP_MODE_AP)) { | 1032 | (pDevice->eOPMode == OP_MODE_AP)) { |
1034 | MEMvCopy(&(pBuf->Data.abyRA[0]), &(psEthHeader->abyDstAddr[0]), U_ETHER_ADDR_LEN); | 1033 | memcpy(&(pBuf->Data.abyRA[0]), &(psEthHeader->abyDstAddr[0]), U_ETHER_ADDR_LEN); |
1035 | } | 1034 | } |
1036 | else { | 1035 | else { |
1037 | MEMvCopy(&(pBuf->Data.abyRA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); | 1036 | memcpy(&(pBuf->Data.abyRA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); |
1038 | } | 1037 | } |
1039 | 1038 | ||
1040 | if (pDevice->eOPMode == OP_MODE_AP) { | 1039 | if (pDevice->eOPMode == OP_MODE_AP) { |
1041 | MEMvCopy(&(pBuf->Data.abyTA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); | 1040 | memcpy(&(pBuf->Data.abyTA[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); |
1042 | } | 1041 | } |
1043 | else { | 1042 | else { |
1044 | MEMvCopy(&(pBuf->Data.abyTA[0]), &(psEthHeader->abySrcAddr[0]), U_ETHER_ADDR_LEN); | 1043 | memcpy(&(pBuf->Data.abyTA[0]), &(psEthHeader->abySrcAddr[0]), U_ETHER_ADDR_LEN); |
1045 | } | 1044 | } |
1046 | } | 1045 | } |
1047 | } | 1046 | } |
@@ -1100,7 +1099,7 @@ s_vFillCTSHead ( | |||
1100 | pBuf->Data.wDurationID = pBuf->wDuration_ba; | 1099 | pBuf->Data.wDurationID = pBuf->wDuration_ba; |
1101 | pBuf->Data.wFrameControl = TYPE_CTL_CTS;//0x00C4 | 1100 | pBuf->Data.wFrameControl = TYPE_CTL_CTS;//0x00C4 |
1102 | pBuf->Data.wReserved = 0x0000; | 1101 | pBuf->Data.wReserved = 0x0000; |
1103 | MEMvCopy(&(pBuf->Data.abyRA[0]), &(pDevice->abyCurrentNetAddr[0]), U_ETHER_ADDR_LEN); | 1102 | memcpy(&(pBuf->Data.abyRA[0]), &(pDevice->abyCurrentNetAddr[0]), U_ETHER_ADDR_LEN); |
1104 | 1103 | ||
1105 | } else { //if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) | 1104 | } else { //if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) |
1106 | PSCTS pBuf = (PSCTS)pvCTS; | 1105 | PSCTS pBuf = (PSCTS)pvCTS; |
@@ -1118,7 +1117,7 @@ s_vFillCTSHead ( | |||
1118 | pBuf->Data.wDurationID = pBuf->wDuration_ba; | 1117 | pBuf->Data.wDurationID = pBuf->wDuration_ba; |
1119 | pBuf->Data.wFrameControl = TYPE_CTL_CTS;//0x00C4 | 1118 | pBuf->Data.wFrameControl = TYPE_CTL_CTS;//0x00C4 |
1120 | pBuf->Data.wReserved = 0x0000; | 1119 | pBuf->Data.wReserved = 0x0000; |
1121 | MEMvCopy(&(pBuf->Data.abyRA[0]), &(pDevice->abyCurrentNetAddr[0]), U_ETHER_ADDR_LEN); | 1120 | memcpy(&(pBuf->Data.abyRA[0]), &(pDevice->abyCurrentNetAddr[0]), U_ETHER_ADDR_LEN); |
1122 | } | 1121 | } |
1123 | } | 1122 | } |
1124 | } | 1123 | } |
@@ -1546,7 +1545,7 @@ s_cbFillTxBufHead ( | |||
1546 | } | 1545 | } |
1547 | } // Auto Fall Back | 1546 | } // Auto Fall Back |
1548 | } | 1547 | } |
1549 | ZERO_MEMORY((PVOID)(pbyTxBufferAddr + wTxBufSize), (cbHeaderLength - wTxBufSize)); | 1548 | memset((PVOID)(pbyTxBufferAddr + wTxBufSize), 0, (cbHeaderLength - wTxBufSize)); |
1550 | 1549 | ||
1551 | ////////////////////////////////////////////////////////////////// | 1550 | ////////////////////////////////////////////////////////////////// |
1552 | if ((bNeedEncrypt == TRUE) && (pTransmitKey != NULL) && (pTransmitKey->byCipherSuite == KEY_CTL_TKIP)) { | 1551 | if ((bNeedEncrypt == TRUE) && (pTransmitKey != NULL) && (pTransmitKey->byCipherSuite == KEY_CTL_TKIP)) { |
@@ -1627,13 +1626,13 @@ s_cbFillTxBufHead ( | |||
1627 | if (ntohs(psEthHeader->wType) > MAX_DATA_LEN) { | 1626 | if (ntohs(psEthHeader->wType) > MAX_DATA_LEN) { |
1628 | if ((psEthHeader->wType == TYPE_PKT_IPX) || | 1627 | if ((psEthHeader->wType == TYPE_PKT_IPX) || |
1629 | (psEthHeader->wType == cpu_to_le16(0xF380))) { | 1628 | (psEthHeader->wType == cpu_to_le16(0xF380))) { |
1630 | MEMvCopy((PBYTE) (pbyPayloadHead), &pDevice->abySNAP_Bridgetunnel[0], 6); | 1629 | memcpy((PBYTE) (pbyPayloadHead), &pDevice->abySNAP_Bridgetunnel[0], 6); |
1631 | } | 1630 | } |
1632 | else { | 1631 | else { |
1633 | MEMvCopy((PBYTE) (pbyPayloadHead), &pDevice->abySNAP_RFC1042[0], 6); | 1632 | memcpy((PBYTE) (pbyPayloadHead), &pDevice->abySNAP_RFC1042[0], 6); |
1634 | } | 1633 | } |
1635 | pbyType = (PBYTE) (pbyPayloadHead + 6); | 1634 | pbyType = (PBYTE) (pbyPayloadHead + 6); |
1636 | MEMvCopy(pbyType, &(psEthHeader->wType), sizeof(WORD)); | 1635 | memcpy(pbyType, &(psEthHeader->wType), sizeof(WORD)); |
1637 | cb802_1_H_len = 8; | 1636 | cb802_1_H_len = 8; |
1638 | } | 1637 | } |
1639 | 1638 | ||
@@ -1655,10 +1654,10 @@ s_cbFillTxBufHead ( | |||
1655 | 1654 | ||
1656 | uLength = cbHeaderLength + cbMACHdLen + uPadding + cbIVlen + cb802_1_H_len; | 1655 | uLength = cbHeaderLength + cbMACHdLen + uPadding + cbIVlen + cb802_1_H_len; |
1657 | //copy TxBufferHeader + MacHeader to desc | 1656 | //copy TxBufferHeader + MacHeader to desc |
1658 | MEMvCopy(pbyBuffer, (PVOID)psTxBufHd, uLength); | 1657 | memcpy(pbyBuffer, (PVOID)psTxBufHd, uLength); |
1659 | 1658 | ||
1660 | // Copy the Packet into a tx Buffer | 1659 | // Copy the Packet into a tx Buffer |
1661 | MEMvCopy((pbyBuffer + uLength), (pPacket + 14), (cbFragPayloadSize - cb802_1_H_len)); | 1660 | memcpy((pbyBuffer + uLength), (pPacket + 14), (cbFragPayloadSize - cb802_1_H_len)); |
1662 | 1661 | ||
1663 | 1662 | ||
1664 | uTotalCopyLength += cbFragPayloadSize - cb802_1_H_len; | 1663 | uTotalCopyLength += cbFragPayloadSize - cb802_1_H_len; |
@@ -1742,12 +1741,12 @@ s_cbFillTxBufHead ( | |||
1742 | uLength = cbHeaderLength + cbMACHdLen + uPadding + cbIVlen; | 1741 | uLength = cbHeaderLength + cbMACHdLen + uPadding + cbIVlen; |
1743 | 1742 | ||
1744 | //copy TxBufferHeader + MacHeader to desc | 1743 | //copy TxBufferHeader + MacHeader to desc |
1745 | MEMvCopy(pbyBuffer, (PVOID)psTxBufHd, uLength); | 1744 | memcpy(pbyBuffer, (PVOID)psTxBufHd, uLength); |
1746 | 1745 | ||
1747 | // Copy the Packet into a tx Buffer | 1746 | // Copy the Packet into a tx Buffer |
1748 | if (bMIC2Frag == FALSE) { | 1747 | if (bMIC2Frag == FALSE) { |
1749 | 1748 | ||
1750 | MEMvCopy((pbyBuffer + uLength), | 1749 | memcpy((pbyBuffer + uLength), |
1751 | (pPacket + 14 + uTotalCopyLength), | 1750 | (pPacket + 14 + uTotalCopyLength), |
1752 | (cbLastFragPayloadSize - cbMIClen) | 1751 | (cbLastFragPayloadSize - cbMIClen) |
1753 | ); | 1752 | ); |
@@ -1768,16 +1767,16 @@ s_cbFillTxBufHead ( | |||
1768 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Last MIC:%lX, %lX\n", *pdwMIC_L, *pdwMIC_R); | 1767 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Last MIC:%lX, %lX\n", *pdwMIC_L, *pdwMIC_R); |
1769 | } else { | 1768 | } else { |
1770 | if (uMICFragLen >= 4) { | 1769 | if (uMICFragLen >= 4) { |
1771 | MEMvCopy((pbyBuffer + uLength), ((PBYTE)&dwSafeMIC_R + (uMICFragLen - 4)), | 1770 | memcpy((pbyBuffer + uLength), ((PBYTE)&dwSafeMIC_R + (uMICFragLen - 4)), |
1772 | (cbMIClen - uMICFragLen)); | 1771 | (cbMIClen - uMICFragLen)); |
1773 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"LAST: uMICFragLen >= 4: %X, %d\n", | 1772 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"LAST: uMICFragLen >= 4: %X, %d\n", |
1774 | *(PBYTE)((PBYTE)&dwSafeMIC_R + (uMICFragLen - 4)), | 1773 | *(PBYTE)((PBYTE)&dwSafeMIC_R + (uMICFragLen - 4)), |
1775 | (cbMIClen - uMICFragLen)); | 1774 | (cbMIClen - uMICFragLen)); |
1776 | 1775 | ||
1777 | } else { | 1776 | } else { |
1778 | MEMvCopy((pbyBuffer + uLength), ((PBYTE)&dwSafeMIC_L + uMICFragLen), | 1777 | memcpy((pbyBuffer + uLength), ((PBYTE)&dwSafeMIC_L + uMICFragLen), |
1779 | (4 - uMICFragLen)); | 1778 | (4 - uMICFragLen)); |
1780 | MEMvCopy((pbyBuffer + uLength + (4 - uMICFragLen)), &dwSafeMIC_R, 4); | 1779 | memcpy((pbyBuffer + uLength + (4 - uMICFragLen)), &dwSafeMIC_R, 4); |
1781 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"LAST: uMICFragLen < 4: %X, %d\n", | 1780 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"LAST: uMICFragLen < 4: %X, %d\n", |
1782 | *(PBYTE)((PBYTE)&dwSafeMIC_R + uMICFragLen - 4), | 1781 | *(PBYTE)((PBYTE)&dwSafeMIC_R + uMICFragLen - 4), |
1783 | (cbMIClen - uMICFragLen)); | 1782 | (cbMIClen - uMICFragLen)); |
@@ -1877,10 +1876,10 @@ s_cbFillTxBufHead ( | |||
1877 | uLength = cbHeaderLength + cbMACHdLen + uPadding + cbIVlen; | 1876 | uLength = cbHeaderLength + cbMACHdLen + uPadding + cbIVlen; |
1878 | 1877 | ||
1879 | //copy TxBufferHeader + MacHeader to desc | 1878 | //copy TxBufferHeader + MacHeader to desc |
1880 | MEMvCopy(pbyBuffer, (PVOID)psTxBufHd, uLength); | 1879 | memcpy(pbyBuffer, (PVOID)psTxBufHd, uLength); |
1881 | 1880 | ||
1882 | // Copy the Packet into a tx Buffer | 1881 | // Copy the Packet into a tx Buffer |
1883 | MEMvCopy((pbyBuffer + uLength), | 1882 | memcpy((pbyBuffer + uLength), |
1884 | (pPacket + 14 + uTotalCopyLength), | 1883 | (pPacket + 14 + uTotalCopyLength), |
1885 | cbFragPayloadSize | 1884 | cbFragPayloadSize |
1886 | ); | 1885 | ); |
@@ -1991,13 +1990,13 @@ s_cbFillTxBufHead ( | |||
1991 | if (ntohs(psEthHeader->wType) > MAX_DATA_LEN) { | 1990 | if (ntohs(psEthHeader->wType) > MAX_DATA_LEN) { |
1992 | if ((psEthHeader->wType == TYPE_PKT_IPX) || | 1991 | if ((psEthHeader->wType == TYPE_PKT_IPX) || |
1993 | (psEthHeader->wType == cpu_to_le16(0xF380))) { | 1992 | (psEthHeader->wType == cpu_to_le16(0xF380))) { |
1994 | MEMvCopy((PBYTE) (pbyPayloadHead), &pDevice->abySNAP_Bridgetunnel[0], 6); | 1993 | memcpy((PBYTE) (pbyPayloadHead), &pDevice->abySNAP_Bridgetunnel[0], 6); |
1995 | } | 1994 | } |
1996 | else { | 1995 | else { |
1997 | MEMvCopy((PBYTE) (pbyPayloadHead), &pDevice->abySNAP_RFC1042[0], 6); | 1996 | memcpy((PBYTE) (pbyPayloadHead), &pDevice->abySNAP_RFC1042[0], 6); |
1998 | } | 1997 | } |
1999 | pbyType = (PBYTE) (pbyPayloadHead + 6); | 1998 | pbyType = (PBYTE) (pbyPayloadHead + 6); |
2000 | MEMvCopy(pbyType, &(psEthHeader->wType), sizeof(WORD)); | 1999 | memcpy(pbyType, &(psEthHeader->wType), sizeof(WORD)); |
2001 | cb802_1_H_len = 8; | 2000 | cb802_1_H_len = 8; |
2002 | } | 2001 | } |
2003 | 2002 | ||
@@ -2017,10 +2016,10 @@ s_cbFillTxBufHead ( | |||
2017 | uLength = cbHeaderLength + cbMACHdLen + uPadding + cbIVlen + cb802_1_H_len; | 2016 | uLength = cbHeaderLength + cbMACHdLen + uPadding + cbIVlen + cb802_1_H_len; |
2018 | 2017 | ||
2019 | //copy TxBufferHeader + MacHeader to desc | 2018 | //copy TxBufferHeader + MacHeader to desc |
2020 | MEMvCopy(pbyBuffer, (PVOID)psTxBufHd, uLength); | 2019 | memcpy(pbyBuffer, (PVOID)psTxBufHd, uLength); |
2021 | 2020 | ||
2022 | // Copy the Packet into a tx Buffer | 2021 | // Copy the Packet into a tx Buffer |
2023 | MEMvCopy((pbyBuffer + uLength), | 2022 | memcpy((pbyBuffer + uLength), |
2024 | (pPacket + 14), | 2023 | (pPacket + 14), |
2025 | cbFrameBodySize - cb802_1_H_len | 2024 | cbFrameBodySize - cb802_1_H_len |
2026 | ); | 2025 | ); |
@@ -2120,7 +2119,7 @@ vGenerateFIFOHeader ( | |||
2120 | 2119 | ||
2121 | wTxBufSize = sizeof(STxBufHead); | 2120 | wTxBufSize = sizeof(STxBufHead); |
2122 | 2121 | ||
2123 | ZERO_MEMORY(pTxBufHead, wTxBufSize); | 2122 | memset(pTxBufHead, 0, wTxBufSize); |
2124 | //Set FIFOCTL_NEEDACK | 2123 | //Set FIFOCTL_NEEDACK |
2125 | 2124 | ||
2126 | if ((pDevice->eOPMode == OP_MODE_ADHOC) || | 2125 | if ((pDevice->eOPMode == OP_MODE_ADHOC) || |
@@ -2280,7 +2279,7 @@ vGenerateMACHeader ( | |||
2280 | { | 2279 | { |
2281 | PS802_11Header pMACHeader = (PS802_11Header)pbyBufferAddr; | 2280 | PS802_11Header pMACHeader = (PS802_11Header)pbyBufferAddr; |
2282 | 2281 | ||
2283 | ZERO_MEMORY(pMACHeader, (sizeof(S802_11Header))); //- sizeof(pMACHeader->dwIV))); | 2282 | memset(pMACHeader, 0, (sizeof(S802_11Header))); //- sizeof(pMACHeader->dwIV))); |
2284 | 2283 | ||
2285 | if (uDMAIdx == TYPE_ATIMDMA) { | 2284 | if (uDMAIdx == TYPE_ATIMDMA) { |
2286 | pMACHeader->wFrameCtl = TYPE_802_11_ATIM; | 2285 | pMACHeader->wFrameCtl = TYPE_802_11_ATIM; |
@@ -2289,21 +2288,21 @@ vGenerateMACHeader ( | |||
2289 | } | 2288 | } |
2290 | 2289 | ||
2291 | if (pDevice->eOPMode == OP_MODE_AP) { | 2290 | if (pDevice->eOPMode == OP_MODE_AP) { |
2292 | MEMvCopy(&(pMACHeader->abyAddr1[0]), &(psEthHeader->abyDstAddr[0]), U_ETHER_ADDR_LEN); | 2291 | memcpy(&(pMACHeader->abyAddr1[0]), &(psEthHeader->abyDstAddr[0]), U_ETHER_ADDR_LEN); |
2293 | MEMvCopy(&(pMACHeader->abyAddr2[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); | 2292 | memcpy(&(pMACHeader->abyAddr2[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); |
2294 | MEMvCopy(&(pMACHeader->abyAddr3[0]), &(psEthHeader->abySrcAddr[0]), U_ETHER_ADDR_LEN); | 2293 | memcpy(&(pMACHeader->abyAddr3[0]), &(psEthHeader->abySrcAddr[0]), U_ETHER_ADDR_LEN); |
2295 | pMACHeader->wFrameCtl |= FC_FROMDS; | 2294 | pMACHeader->wFrameCtl |= FC_FROMDS; |
2296 | } | 2295 | } |
2297 | else { | 2296 | else { |
2298 | if (pDevice->eOPMode == OP_MODE_ADHOC) { | 2297 | if (pDevice->eOPMode == OP_MODE_ADHOC) { |
2299 | MEMvCopy(&(pMACHeader->abyAddr1[0]), &(psEthHeader->abyDstAddr[0]), U_ETHER_ADDR_LEN); | 2298 | memcpy(&(pMACHeader->abyAddr1[0]), &(psEthHeader->abyDstAddr[0]), U_ETHER_ADDR_LEN); |
2300 | MEMvCopy(&(pMACHeader->abyAddr2[0]), &(psEthHeader->abySrcAddr[0]), U_ETHER_ADDR_LEN); | 2299 | memcpy(&(pMACHeader->abyAddr2[0]), &(psEthHeader->abySrcAddr[0]), U_ETHER_ADDR_LEN); |
2301 | MEMvCopy(&(pMACHeader->abyAddr3[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); | 2300 | memcpy(&(pMACHeader->abyAddr3[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); |
2302 | } | 2301 | } |
2303 | else { | 2302 | else { |
2304 | MEMvCopy(&(pMACHeader->abyAddr3[0]), &(psEthHeader->abyDstAddr[0]), U_ETHER_ADDR_LEN); | 2303 | memcpy(&(pMACHeader->abyAddr3[0]), &(psEthHeader->abyDstAddr[0]), U_ETHER_ADDR_LEN); |
2305 | MEMvCopy(&(pMACHeader->abyAddr2[0]), &(psEthHeader->abySrcAddr[0]), U_ETHER_ADDR_LEN); | 2304 | memcpy(&(pMACHeader->abyAddr2[0]), &(psEthHeader->abySrcAddr[0]), U_ETHER_ADDR_LEN); |
2306 | MEMvCopy(&(pMACHeader->abyAddr1[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); | 2305 | memcpy(&(pMACHeader->abyAddr1[0]), &(pDevice->abyBSSID[0]), U_ETHER_ADDR_LEN); |
2307 | pMACHeader->wFrameCtl |= FC_TODS; | 2306 | pMACHeader->wFrameCtl |= FC_TODS; |
2308 | } | 2307 | } |
2309 | } | 2308 | } |
@@ -2316,7 +2315,7 @@ vGenerateMACHeader ( | |||
2316 | if (pDevice->bLongHeader) { | 2315 | if (pDevice->bLongHeader) { |
2317 | PWLAN_80211HDR_A4 pMACA4Header = (PWLAN_80211HDR_A4) pbyBufferAddr; | 2316 | PWLAN_80211HDR_A4 pMACA4Header = (PWLAN_80211HDR_A4) pbyBufferAddr; |
2318 | pMACHeader->wFrameCtl |= (FC_TODS | FC_FROMDS); | 2317 | pMACHeader->wFrameCtl |= (FC_TODS | FC_FROMDS); |
2319 | MEMvCopy(pMACA4Header->abyAddr4, pDevice->abyBSSID, WLAN_ADDR_LEN); | 2318 | memcpy(pMACA4Header->abyAddr4, pDevice->abyBSSID, WLAN_ADDR_LEN); |
2320 | } | 2319 | } |
2321 | pMACHeader->wSeqCtl = cpu_to_le16(pDevice->wSeqCounter << 4); | 2320 | pMACHeader->wSeqCtl = cpu_to_le16(pDevice->wSeqCounter << 4); |
2322 | 2321 | ||
@@ -2518,10 +2517,10 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { | |||
2518 | cbHeaderSize = wTxBufSize + sizeof(SRrvTime_ab) + sizeof(STxDataHead_ab); | 2517 | cbHeaderSize = wTxBufSize + sizeof(SRrvTime_ab) + sizeof(STxDataHead_ab); |
2519 | } | 2518 | } |
2520 | 2519 | ||
2521 | ZERO_MEMORY((PVOID)(pbyTxBufferAddr + wTxBufSize), (cbHeaderSize - wTxBufSize)); | 2520 | memset((PVOID)(pbyTxBufferAddr + wTxBufSize), 0, (cbHeaderSize - wTxBufSize)); |
2522 | 2521 | ||
2523 | MEMvCopy(&(sEthHeader.abyDstAddr[0]), &(pPacket->p80211Header->sA3.abyAddr1[0]), U_ETHER_ADDR_LEN); | 2522 | memcpy(&(sEthHeader.abyDstAddr[0]), &(pPacket->p80211Header->sA3.abyAddr1[0]), U_ETHER_ADDR_LEN); |
2524 | MEMvCopy(&(sEthHeader.abySrcAddr[0]), &(pPacket->p80211Header->sA3.abyAddr2[0]), U_ETHER_ADDR_LEN); | 2523 | memcpy(&(sEthHeader.abySrcAddr[0]), &(pPacket->p80211Header->sA3.abyAddr2[0]), U_ETHER_ADDR_LEN); |
2525 | //========================= | 2524 | //========================= |
2526 | // No Fragmentation | 2525 | // No Fragmentation |
2527 | //========================= | 2526 | //========================= |
@@ -2591,13 +2590,13 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { | |||
2591 | s_vFillTxKey(pDevice, (PBYTE)(pTxBufHead->adwTxKey), pbyIVHead, pTransmitKey, | 2590 | s_vFillTxKey(pDevice, (PBYTE)(pTxBufHead->adwTxKey), pbyIVHead, pTransmitKey, |
2592 | (PBYTE)pMACHeader, (WORD)cbFrameBodySize, NULL); | 2591 | (PBYTE)pMACHeader, (WORD)cbFrameBodySize, NULL); |
2593 | 2592 | ||
2594 | MEMvCopy(pMACHeader, pPacket->p80211Header, cbMacHdLen); | 2593 | memcpy(pMACHeader, pPacket->p80211Header, cbMacHdLen); |
2595 | MEMvCopy(pbyPayloadHead, ((PBYTE)(pPacket->p80211Header) + cbMacHdLen), | 2594 | memcpy(pbyPayloadHead, ((PBYTE)(pPacket->p80211Header) + cbMacHdLen), |
2596 | cbFrameBodySize); | 2595 | cbFrameBodySize); |
2597 | } | 2596 | } |
2598 | else { | 2597 | else { |
2599 | // Copy the Packet into a tx Buffer | 2598 | // Copy the Packet into a tx Buffer |
2600 | MEMvCopy(pMACHeader, pPacket->p80211Header, pPacket->cbMPDULen); | 2599 | memcpy(pMACHeader, pPacket->p80211Header, pPacket->cbMPDULen); |
2601 | } | 2600 | } |
2602 | 2601 | ||
2603 | pMACHeader->wSeqCtl = cpu_to_le16(pDevice->wSeqCounter << 4); | 2602 | pMACHeader->wSeqCtl = cpu_to_le16(pDevice->wSeqCounter << 4); |
@@ -2714,7 +2713,7 @@ CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { | |||
2714 | 2713 | ||
2715 | //Generate Beacon Header | 2714 | //Generate Beacon Header |
2716 | pMACHeader = (PS802_11Header)(pbyBuffer + cbHeaderSize); | 2715 | pMACHeader = (PS802_11Header)(pbyBuffer + cbHeaderSize); |
2717 | MEMvCopy(pMACHeader, pPacket->p80211Header, pPacket->cbMPDULen); | 2716 | memcpy(pMACHeader, pPacket->p80211Header, pPacket->cbMPDULen); |
2718 | 2717 | ||
2719 | pMACHeader->wDurationID = 0; | 2718 | pMACHeader->wDurationID = 0; |
2720 | pMACHeader->wSeqCtl = cpu_to_le16(pDevice->wSeqCounter << 4); | 2719 | pMACHeader->wSeqCtl = cpu_to_le16(pDevice->wSeqCounter << 4); |
@@ -3063,9 +3062,9 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDU | |||
3063 | 3062 | ||
3064 | } | 3063 | } |
3065 | 3064 | ||
3066 | ZERO_MEMORY((PVOID)(pbyTxBufferAddr + wTxBufSize), (cbHeaderSize - wTxBufSize)); | 3065 | memset((PVOID)(pbyTxBufferAddr + wTxBufSize), 0, (cbHeaderSize - wTxBufSize)); |
3067 | MEMvCopy(&(sEthHeader.abyDstAddr[0]), &(p80211Header->sA3.abyAddr1[0]), U_ETHER_ADDR_LEN); | 3066 | memcpy(&(sEthHeader.abyDstAddr[0]), &(p80211Header->sA3.abyAddr1[0]), U_ETHER_ADDR_LEN); |
3068 | MEMvCopy(&(sEthHeader.abySrcAddr[0]), &(p80211Header->sA3.abyAddr2[0]), U_ETHER_ADDR_LEN); | 3067 | memcpy(&(sEthHeader.abySrcAddr[0]), &(p80211Header->sA3.abyAddr2[0]), U_ETHER_ADDR_LEN); |
3069 | //========================= | 3068 | //========================= |
3070 | // No Fragmentation | 3069 | // No Fragmentation |
3071 | //========================= | 3070 | //========================= |