Skip to content

L
linux
Commit dec572cb authored by Charles Clément's avatar Charles Clément Committed by Greg Kroah-Hartman
Browse files
Options

Staging: vt6655: remove ULONG_PTR typedef 

Signed-off-by: default avatarCharles Clément <caratorn@gmail.com>
parent e54d9eb9
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
drivers/staging/vt6655/bssdb.c
View file @ dec572cb
...@@ -471,7 +471,7 @@ BSSbInsertToBSSList ( ...@@ -471,7 +471,7 @@ BSSbInsertToBSSList (
if (pRSNWPA != NULL) { if (pRSNWPA != NULL) {
unsigned int uLen = pRSNWPA->len + 2; 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; pBSSList->wWPALen = uLen;
memcpy(pBSSList->byWPAIE, pRSNWPA, uLen); memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
WPA_ParseRSN(pBSSList, pRSNWPA); WPA_ParseRSN(pBSSList, pRSNWPA);
...@@ -482,7 +482,7 @@ BSSbInsertToBSSList ( ...@@ -482,7 +482,7 @@ BSSbInsertToBSSList (
if (pRSN != NULL) { if (pRSN != NULL) {
unsigned int uLen = pRSN->len + 2; 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; pBSSList->wRSNLen = uLen;
memcpy(pBSSList->byRSNIE, pRSN, uLen); memcpy(pBSSList->byRSNIE, pRSN, uLen);
WPA2vParseRSN(pBSSList, pRSN); WPA2vParseRSN(pBSSList, pRSN);
...@@ -671,7 +671,7 @@ BSSbUpdateToBSSList ( ...@@ -671,7 +671,7 @@ BSSbUpdateToBSSList (
if (pRSNWPA != NULL) { if (pRSNWPA != NULL) {
unsigned int uLen = pRSNWPA->len + 2; 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; pBSSList->wWPALen = uLen;
memcpy(pBSSList->byWPAIE, pRSNWPA, uLen); memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
WPA_ParseRSN(pBSSList, pRSNWPA); WPA_ParseRSN(pBSSList, pRSNWPA);
...@@ -682,7 +682,7 @@ BSSbUpdateToBSSList ( ...@@ -682,7 +682,7 @@ BSSbUpdateToBSSList (
if (pRSN != NULL) { if (pRSN != NULL) {
unsigned int uLen = pRSN->len + 2; 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; pBSSList->wRSNLen = uLen;
memcpy(pBSSList->byRSNIE, pRSN, uLen); memcpy(pBSSList->byRSNIE, pRSN, uLen);
WPA2vParseRSN(pBSSList, pRSN); WPA2vParseRSN(pBSSList, pRSN);
......
drivers/staging/vt6655/ttype.h
View file @ dec572cb
...@@ -86,7 +86,6 @@ typedef UQuadWord QWORD; // 64-bit ...@@ -86,7 +86,6 @@ typedef UQuadWord QWORD; // 64-bit
/****** Common pointer types ***********************************************/ /****** Common pointer types ***********************************************/
typedef unsigned long ULONG_PTR; // 32-bit
typedef unsigned long DWORD_PTR; // 32-bit typedef unsigned long DWORD_PTR; // 32-bit
// boolean pointer // boolean pointer
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7