diff options
author | Charles Clément <caratorn@gmail.com> | 2010-06-24 14:02:25 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-24 17:23:17 -0400 |
commit | 0f4c60d61e9c10a0733eacd650c101189bdf75cd (patch) | |
tree | 88cd18c474739648e45ec68e303c0f7351ee546c /drivers/staging/vt6655/rxtx.c | |
parent | 17701d14b613b8495cdd8b803c22d3f33d1face8 (diff) |
Staging: vt6655: remove DWORD typedef
Replace all occurrences with unsigned long type, except for pointer fields that
should be u32 in packed structures and 8-byte-aligned 8 byte long structure
QWORD.
Thanks to Jiri Slaby for pointing out that simply replacing by unsigned long is
wrong on x86-64 arch.
Signed-off-by: Charles Clément <caratorn@gmail.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 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 478c140be11..6664d78e8db 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c | |||
@@ -225,7 +225,7 @@ s_vFillTxKey ( | |||
225 | unsigned long *pdwExtIV = (unsigned long *) ((unsigned char *)pbyIVHead+4); | 225 | unsigned long *pdwExtIV = (unsigned long *) ((unsigned char *)pbyIVHead+4); |
226 | WORD wValue; | 226 | WORD wValue; |
227 | PS802_11Header pMACHeader = (PS802_11Header)pbyHdrBuf; | 227 | PS802_11Header pMACHeader = (PS802_11Header)pbyHdrBuf; |
228 | DWORD dwRevIVCounter; | 228 | unsigned long dwRevIVCounter; |
229 | BYTE byKeyIndex = 0; | 229 | BYTE byKeyIndex = 0; |
230 | 230 | ||
231 | 231 | ||
@@ -337,7 +337,7 @@ s_vSWencryption ( | |||
337 | ) | 337 | ) |
338 | { | 338 | { |
339 | unsigned int cbICVlen = 4; | 339 | unsigned int cbICVlen = 4; |
340 | DWORD dwICV = 0xFFFFFFFFL; | 340 | unsigned long dwICV = 0xFFFFFFFFL; |
341 | unsigned long *pdwICV; | 341 | unsigned long *pdwICV; |
342 | 342 | ||
343 | if (pTransmitKey == NULL) | 343 | if (pTransmitKey == NULL) |
@@ -1355,13 +1355,13 @@ s_cbFillTxBufHead ( | |||
1355 | unsigned int uLength = 0; | 1355 | unsigned int uLength = 0; |
1356 | unsigned int uTmpLen = 0; | 1356 | unsigned int uTmpLen = 0; |
1357 | // BYTE abyTmp[8]; | 1357 | // BYTE abyTmp[8]; |
1358 | // DWORD dwCRC; | 1358 | // unsigned long dwCRC; |
1359 | unsigned int cbMICHDR = 0; | 1359 | unsigned int cbMICHDR = 0; |
1360 | DWORD dwMICKey0, dwMICKey1; | 1360 | unsigned long dwMICKey0, dwMICKey1; |
1361 | DWORD dwMIC_Priority; | 1361 | unsigned long dwMIC_Priority; |
1362 | unsigned long *pdwMIC_L; | 1362 | unsigned long *pdwMIC_L; |
1363 | unsigned long *pdwMIC_R; | 1363 | unsigned long *pdwMIC_R; |
1364 | DWORD dwSafeMIC_L, dwSafeMIC_R; //Fix "Last Frag Size" < "MIC length". | 1364 | unsigned long dwSafeMIC_L, dwSafeMIC_R; //Fix "Last Frag Size" < "MIC length". |
1365 | BOOL bMIC2Frag = FALSE; | 1365 | BOOL bMIC2Frag = FALSE; |
1366 | unsigned int uMICFragLen = 0; | 1366 | unsigned int uMICFragLen = 0; |
1367 | unsigned int uMACfragNum = 1; | 1367 | unsigned int uMACfragNum = 1; |
@@ -2850,8 +2850,8 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un | |||
2850 | unsigned int uPadding = 0; | 2850 | unsigned int uPadding = 0; |
2851 | unsigned int cbMICHDR = 0; | 2851 | unsigned int cbMICHDR = 0; |
2852 | unsigned int uLength = 0; | 2852 | unsigned int uLength = 0; |
2853 | DWORD dwMICKey0, dwMICKey1; | 2853 | unsigned long dwMICKey0, dwMICKey1; |
2854 | DWORD dwMIC_Priority; | 2854 | unsigned long dwMIC_Priority; |
2855 | unsigned long *pdwMIC_L; | 2855 | unsigned long *pdwMIC_L; |
2856 | unsigned long *pdwMIC_R; | 2856 | unsigned long *pdwMIC_R; |
2857 | WORD wTxBufSize; | 2857 | WORD wTxBufSize; |