diff options
| author |   Jim Lieb <lieb@canonical.com> | 2009-07-23 17:20:49 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:06 -0700 |
| commit | db6cb9036b2756c50efc43127c476786ea92eae2 (patch) | |
| tree | 0891c0db88bc31edddf31f92f2037bca0922939d /drivers/staging/vt6655/IEEE11h.c | |
| parent | Staging: otus: includecheck fix: drivers/staging/otus/usbdrv.h (diff) | |
| download | linux-dev-db6cb9036b2756c50efc43127c476786ea92eae2.tar.xz linux-dev-db6cb9036b2756c50efc43127c476786ea92eae2.zip | |
Staging: vt665x: 64bit compile fixes Part 1
Fix compile problems with 64bit. These issues could cause corrupted
address crashes. In the process, replaced some definitions to use more
portable kernel types.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655/IEEE11h.c')
| -rw-r--r-- | drivers/staging/vt6655/IEEE11h.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/vt6655/IEEE11h.c b/drivers/staging/vt6655/IEEE11h.c index 5f25b8e88bd9..b0f4eb5af891 100644 --- a/drivers/staging/vt6655/IEEE11h.c +++ b/drivers/staging/vt6655/IEEE11h.c @@ -120,13 +120,13 @@ typedef struct _WLAN_FRAME_TPCREP { /*--------------------- Static Functions --------------------------*/ static BOOL s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq, UINT uLength) { - UINT uNumOfEIDs = 0; + size_t uNumOfEIDs = 0; BOOL bResult = TRUE; if (uLength <= WLAN_A3FR_MAXLEN) { MEMvCopy(pMgmt->abyCurrentMSRReq, pMSRReq, uLength); } - uNumOfEIDs = ((uLength - OFFSET(WLAN_FRAME_MSRREQ, sMSRReqEIDs))/ (sizeof(WLAN_IE_MEASURE_REQ))); + uNumOfEIDs = ((uLength - offsetof(WLAN_FRAME_MSRREQ, sMSRReqEIDs))/ (sizeof(WLAN_IE_MEASURE_REQ))); pMgmt->pCurrMeasureEIDRep = &(((PWLAN_FRAME_MSRREP) (pMgmt->abyCurrentMSRRep))->sMSRRepEIDs[0]); pMgmt->uLengthOfRepEIDs = 0; bResult = CARDbStartMeasure(pMgmt->pAdapter, @@ -291,7 +291,7 @@ BOOL IEEE11hbMSRRepTx ( { PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle; PWLAN_FRAME_MSRREP pMSRRep = (PWLAN_FRAME_MSRREP) (pMgmt->abyCurrentMSRRep + sizeof(STxMgmtPacket)); - UINT uLength = 0; + size_t uLength = 0; PSTxMgmtPacket pTxPacket = NULL; pTxPacket = (PSTxMgmtPacket)pMgmt->abyCurrentMSRRep; @@ -311,7 +311,7 @@ BOOL IEEE11hbMSRRepTx ( pMSRRep->byAction = 1; pMSRRep->byDialogToken = ((PWLAN_FRAME_MSRREQ) (pMgmt->abyCurrentMSRReq))->byDialogToken; - uLength = pMgmt->uLengthOfRepEIDs + OFFSET(WLAN_FRAME_MSRREP, sMSRRepEIDs); + uLength = pMgmt->uLengthOfRepEIDs + offsetof(WLAN_FRAME_MSRREP, sMSRRepEIDs); pTxPacket->cbMPDULen = uLength; pTxPacket->cbPayloadLen = uLength - WLAN_HDR_ADDR3_LEN; |