From 43ddbeb99f14ee954588c28bdc047eed605c9c07 Mon Sep 17 00:00:00 2001 From: Andres More Date: Mon, 25 Feb 2013 20:32:54 -0500 Subject: [PATCH] --- yaml --- r: 363318 b: refs/heads/master c: 1f9eedc2ad7ea89175ead78a175944e7152f3688 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/vt6656/bssdb.c | 8 ++++---- trunk/drivers/staging/vt6656/ttype.h | 3 --- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 9791bfd07aed..5b1743c89291 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52a7e64b06f70404c2539e4462063a8df9e4ee13 +refs/heads/master: 1f9eedc2ad7ea89175ead78a175944e7152f3688 diff --git a/trunk/drivers/staging/vt6656/bssdb.c b/trunk/drivers/staging/vt6656/bssdb.c index bbe348e98b9a..759404d57e11 100644 --- a/trunk/drivers/staging/vt6656/bssdb.c +++ b/trunk/drivers/staging/vt6656/bssdb.c @@ -430,7 +430,7 @@ int BSSbInsertToBSSList(struct vnt_private *pDevice, unsigned int uLen = pRSNWPA->len + 2; if (uLen <= (uIELength - - (unsigned int) (ULONG_PTR) ((u8 *) pRSNWPA - pbyIEs))) { + (unsigned int) (u32) ((u8 *) pRSNWPA - pbyIEs))) { pBSSList->wWPALen = uLen; memcpy(pBSSList->byWPAIE, pRSNWPA, uLen); WPA_ParseRSN(pBSSList, pRSNWPA); @@ -443,7 +443,7 @@ int BSSbInsertToBSSList(struct vnt_private *pDevice, unsigned int uLen = pRSN->len + 2; if (uLen <= (uIELength - - (unsigned int) (ULONG_PTR) ((u8 *) pRSN - pbyIEs))) { + (unsigned int) (u32) ((u8 *) pRSN - pbyIEs))) { pBSSList->wRSNLen = uLen; memcpy(pBSSList->byRSNIE, pRSN, uLen); WPA2vParseRSN(pBSSList, pRSN); @@ -592,7 +592,7 @@ int BSSbUpdateToBSSList(struct vnt_private *pDevice, if (pRSNWPA != NULL) { unsigned int uLen = pRSNWPA->len + 2; if (uLen <= (uIELength - - (unsigned int) (ULONG_PTR) ((u8 *) pRSNWPA - pbyIEs))) { + (unsigned int) (u32) ((u8 *) pRSNWPA - pbyIEs))) { pBSSList->wWPALen = uLen; memcpy(pBSSList->byWPAIE, pRSNWPA, uLen); WPA_ParseRSN(pBSSList, pRSNWPA); @@ -604,7 +604,7 @@ int BSSbUpdateToBSSList(struct vnt_private *pDevice, if (pRSN != NULL) { unsigned int uLen = pRSN->len + 2; if (uLen <= (uIELength - - (unsigned int) (ULONG_PTR) ((u8 *) pRSN - pbyIEs))) { + (unsigned int) (u32) ((u8 *) pRSN - pbyIEs))) { pBSSList->wRSNLen = uLen; memcpy(pBSSList->byRSNIE, pRSN, uLen); WPA2vParseRSN(pBSSList, pRSN); diff --git a/trunk/drivers/staging/vt6656/ttype.h b/trunk/drivers/staging/vt6656/ttype.h index b22cf91b1e3c..d1ba96ea7010 100644 --- a/trunk/drivers/staging/vt6656/ttype.h +++ b/trunk/drivers/staging/vt6656/ttype.h @@ -37,9 +37,6 @@ /****** Common pointer types ***********************************************/ -typedef u32 ULONG_PTR; -typedef u32 DWORD_PTR; - // boolean pointer #endif /* __TTYPE_H__ */