Skip to content

Commit

Permalink
staging: vt6656: replaced custom BYTE definition with u8
Browse files Browse the repository at this point in the history 
Checkpatch findings were not resolved, only direct replacement.

sed -i 's/\bBYTE\b/u8/g' drivers/staging/vt6656/*.[ch]
sed -i 's/\bPBYTE\b/u8 */g' drivers/staging/vt6656/*.[ch]

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Andres More authored and Greg Kroah-Hartman committed Mar 11, 2013
1 parent 175c512 commit b902fbf
Show file tree
Hide file tree
Showing 54 changed files with 874 additions and 877 deletions.
24 changes: 12 additions & 12 deletions drivers/staging/vt6656/80211hdr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,15 +269,15 @@
#define WLAN_MGMT_GET_TIM_OFFSET(b) (((b) & ~BIT0) >> 1)

/* 3-Addr & 4-Addr */
#define WLAN_HDR_A3_DATA_PTR(p) (((PBYTE)(p)) + WLAN_HDR_ADDR3_LEN)
#define WLAN_HDR_A4_DATA_PTR(p) (((PBYTE)(p)) + WLAN_HDR_ADDR4_LEN)
#define WLAN_HDR_A3_DATA_PTR(p) (((u8 *)(p)) + WLAN_HDR_ADDR3_LEN)
#define WLAN_HDR_A4_DATA_PTR(p) (((u8 *)(p)) + WLAN_HDR_ADDR4_LEN)

/* IEEE ADDR */
#define IEEE_ADDR_UNIVERSAL 0x02
#define IEEE_ADDR_GROUP 0x01

typedef struct {
BYTE abyAddr[6];
u8 abyAddr[6];
} IEEE_ADDR, *PIEEE_ADDR;

/* 802.11 Header Format */
Expand All @@ -286,8 +286,8 @@ typedef struct tagWLAN_80211HDR_A2 {

WORD wFrameCtl;
WORD wDurationID;
BYTE abyAddr1[WLAN_ADDR_LEN];
BYTE abyAddr2[WLAN_ADDR_LEN];
u8 abyAddr1[WLAN_ADDR_LEN];
u8 abyAddr2[WLAN_ADDR_LEN];

} __attribute__ ((__packed__))
WLAN_80211HDR_A2, *PWLAN_80211HDR_A2;
Expand All @@ -296,9 +296,9 @@ typedef struct tagWLAN_80211HDR_A3 {

WORD wFrameCtl;
WORD wDurationID;
BYTE abyAddr1[WLAN_ADDR_LEN];
BYTE abyAddr2[WLAN_ADDR_LEN];
BYTE abyAddr3[WLAN_ADDR_LEN];
u8 abyAddr1[WLAN_ADDR_LEN];
u8 abyAddr2[WLAN_ADDR_LEN];
u8 abyAddr3[WLAN_ADDR_LEN];
WORD wSeqCtl;

} __attribute__ ((__packed__))
Expand All @@ -308,11 +308,11 @@ typedef struct tagWLAN_80211HDR_A4 {

WORD wFrameCtl;
WORD wDurationID;
BYTE abyAddr1[WLAN_ADDR_LEN];
BYTE abyAddr2[WLAN_ADDR_LEN];
BYTE abyAddr3[WLAN_ADDR_LEN];
u8 abyAddr1[WLAN_ADDR_LEN];
u8 abyAddr2[WLAN_ADDR_LEN];
u8 abyAddr3[WLAN_ADDR_LEN];
WORD wSeqCtl;
BYTE abyAddr4[WLAN_ADDR_LEN];
u8 abyAddr4[WLAN_ADDR_LEN];

} __attribute__ ((__packed__))
WLAN_80211HDR_A4, *PWLAN_80211HDR_A4;
Expand Down
32 changes: 16 additions & 16 deletions drivers/staging/vt6656/80211mgr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ vMgrDecodeBeacon(
+ WLAN_BEACON_OFF_CAPINFO);

/* Information elements */
pItem = (PWLAN_IE)((PBYTE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)))
pItem = (PWLAN_IE)((u8 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)))
+ WLAN_BEACON_OFF_SSID);
while (((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) {
while (((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) {

switch (pItem->byElementID) {
case WLAN_EID_SSID:
Expand Down Expand Up @@ -224,7 +224,7 @@ vMgrDecodeBeacon(
break;

}
pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);
pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len);
}
}

Expand Down Expand Up @@ -376,7 +376,7 @@ vMgrDecodeAssocRequest(
pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
+ WLAN_ASSOCREQ_OFF_SSID);

while (((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) {
while (((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) {
switch (pItem->byElementID) {
case WLAN_EID_SSID:
if (pFrame->pSSID == NULL)
Expand Down Expand Up @@ -407,7 +407,7 @@ vMgrDecodeAssocRequest(
pItem->byElementID);
break;
}
pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);
pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len);
}
}

Expand Down Expand Up @@ -474,9 +474,9 @@ vMgrDecodeAssocResponse(
+ WLAN_ASSOCRESP_OFF_SUPP_RATES);

pItem = (PWLAN_IE)(pFrame->pSuppRates);
pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);
pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len);

if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) {
if ((((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) {
pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pFrame->pExtSuppRates=[%p].\n", pItem);
} else
Expand Down Expand Up @@ -545,7 +545,7 @@ vMgrDecodeReassocRequest(
pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
+ WLAN_REASSOCREQ_OFF_SSID);

while (((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) {
while (((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) {

switch (pItem->byElementID) {
case WLAN_EID_SSID:
Expand Down Expand Up @@ -576,7 +576,7 @@ vMgrDecodeReassocRequest(
pItem->byElementID);
break;
}
pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);
pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len);
}
}

Expand Down Expand Up @@ -626,7 +626,7 @@ vMgrDecodeProbeRequest(
/* Information elements */
pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)));

while (((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) {
while (((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) {

switch (pItem->byElementID) {
case WLAN_EID_SSID:
Expand All @@ -649,7 +649,7 @@ vMgrDecodeProbeRequest(
break;
}

pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);
pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len);
}
}

Expand Down Expand Up @@ -722,7 +722,7 @@ vMgrDecodeProbeResponse(
pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
+ WLAN_PROBERESP_OFF_SSID);

while (((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) {
while (((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) {
switch (pItem->byElementID) {
case WLAN_EID_SSID:
if (pFrame->pSSID == NULL)
Expand Down Expand Up @@ -796,7 +796,7 @@ vMgrDecodeProbeResponse(
break;
}

pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);
pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len);
}
}

Expand Down Expand Up @@ -862,7 +862,7 @@ vMgrDecodeAuthen(
pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
+ WLAN_AUTHEN_OFF_CHALLENGE);

if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_CHALLENGE))
if ((((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_CHALLENGE))
pFrame->pChallenge = (PWLAN_IE_CHALLENGE)pItem;
}

Expand Down Expand Up @@ -980,8 +980,8 @@ vMgrDecodeReassocResponse(
+ WLAN_REASSOCRESP_OFF_SUPP_RATES);

pItem = (PWLAN_IE)(pFrame->pSuppRates);
pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);
pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len);

if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES))
if ((((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES))
pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;
}
Loading

0 comments on commit b902fbf

Please sign in to comment.