From 9ea856eaf997f5bec8f5b6d98b3d9acf51b64847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles=20Cl=C3=A9ment?= <caratorn@gmail.com>
Date: Tue, 22 Jun 2010 08:54:41 -0700
Subject: [PATCH] --- yaml --- r: 205722 b: refs/heads/master c:
 dec572cbe67598080f7beb00279db1a5590cec35 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/staging/vt6655/bssdb.c | 8 ++++----
 trunk/drivers/staging/vt6655/ttype.h | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 44d17ce37fb9..09b85a687364 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e54d9eb95134120e992ed24ae895ff5b4f87a83e
+refs/heads/master: dec572cbe67598080f7beb00279db1a5590cec35
diff --git a/trunk/drivers/staging/vt6655/bssdb.c b/trunk/drivers/staging/vt6655/bssdb.c
index 20f5d29bc411..3196eb53ab30 100644
--- a/trunk/drivers/staging/vt6655/bssdb.c
+++ b/trunk/drivers/staging/vt6655/bssdb.c
@@ -471,7 +471,7 @@ BSSbInsertToBSSList (
     if (pRSNWPA != NULL) {
         unsigned int uLen = pRSNWPA->len + 2;
 
-        if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((unsigned char *)pRSNWPA - pbyIEs))) {
+        if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSNWPA - pbyIEs))) {
             pBSSList->wWPALen = uLen;
             memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
             WPA_ParseRSN(pBSSList, pRSNWPA);
@@ -482,7 +482,7 @@ BSSbInsertToBSSList (
 
     if (pRSN != NULL) {
         unsigned int uLen = pRSN->len + 2;
-        if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((unsigned char *)pRSN - pbyIEs))) {
+        if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSN - pbyIEs))) {
             pBSSList->wRSNLen = uLen;
             memcpy(pBSSList->byRSNIE, pRSN, uLen);
             WPA2vParseRSN(pBSSList, pRSN);
@@ -671,7 +671,7 @@ BSSbUpdateToBSSList (
 
     if (pRSNWPA != NULL) {
         unsigned int uLen = pRSNWPA->len + 2;
-        if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((unsigned char *)pRSNWPA - pbyIEs))) {
+        if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSNWPA - pbyIEs))) {
             pBSSList->wWPALen = uLen;
             memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
             WPA_ParseRSN(pBSSList, pRSNWPA);
@@ -682,7 +682,7 @@ BSSbUpdateToBSSList (
 
     if (pRSN != NULL) {
         unsigned int uLen = pRSN->len + 2;
-        if (uLen <= (uIELength - (unsigned int)(ULONG_PTR)((unsigned char *)pRSN - pbyIEs))) {
+        if (uLen <= (uIELength - (unsigned int)((unsigned char *)pRSN - pbyIEs))) {
             pBSSList->wRSNLen = uLen;
             memcpy(pBSSList->byRSNIE, pRSN, uLen);
             WPA2vParseRSN(pBSSList, pRSN);
diff --git a/trunk/drivers/staging/vt6655/ttype.h b/trunk/drivers/staging/vt6655/ttype.h
index aaad1dbd957d..c684f1a4c91e 100644
--- a/trunk/drivers/staging/vt6655/ttype.h
+++ b/trunk/drivers/staging/vt6655/ttype.h
@@ -86,7 +86,6 @@ typedef UQuadWord       QWORD;          // 64-bit
 
 /****** Common pointer types ***********************************************/
 
-typedef unsigned long   ULONG_PTR;      // 32-bit
 typedef unsigned long   DWORD_PTR;      // 32-bit
 
 // boolean pointer