Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354525
b: refs/heads/master
c: 4e9b5e2
h: refs/heads/master
i:
  354523: 8809a86
v: v3
  • Loading branch information
Andres More authored and Greg Kroah-Hartman committed Feb 15, 2013
1 parent d69dd8b commit 5c71ce6
Show file tree
Hide file tree
Showing 28 changed files with 556 additions and 560 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e269fc2d129ade6543c22052755becf37e306e2a
refs/heads/master: 4e9b5e2b8b7f1a9116d760a25f8ea98b3d5b64f4
8 changes: 4 additions & 4 deletions trunk/drivers/staging/vt6656/80211mgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ vMgrDecodeBeacon(
break;
case WLAN_EID_RSN_WPA:
if (pFrame->pRSNWPA == NULL) {
if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == TRUE)
if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == true)
pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT)pItem;
}
break;
Expand Down Expand Up @@ -393,7 +393,7 @@ vMgrDecodeAssocRequest(
break;
case WLAN_EID_RSN_WPA:
if (pFrame->pRSNWPA == NULL) {
if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == TRUE)
if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == true)
pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT)pItem;
}
break;
Expand Down Expand Up @@ -563,7 +563,7 @@ vMgrDecodeReassocRequest(
break;
case WLAN_EID_RSN_WPA:
if (pFrame->pRSNWPA == NULL)
if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == TRUE)
if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == true)
pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT)pItem;
break;

Expand Down Expand Up @@ -753,7 +753,7 @@ vMgrDecodeProbeResponse(
break;
case WLAN_EID_RSN_WPA:
if (pFrame->pRSNWPA == NULL) {
if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == TRUE)
if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == true)
pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT)pItem;
}
break;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/vt6656/aes_ccmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ bool AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize)
pbyIV = pbyFrame + WLAN_HDR_ADDR3_LEN;
if (WLAN_GET_FC_TODS(*(PWORD) pbyFrame) &&
WLAN_GET_FC_FROMDS(*(PWORD) pbyFrame)) {
bA4 = TRUE;
bA4 = true;
pbyIV += 6; /* 6 is 802.11 address4 */
wHLen += 6;
wPayloadSize -= 6;
Expand Down Expand Up @@ -380,7 +380,7 @@ bool AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize)
/* => above is the packet dec-MIC */

if (!memcmp(abyMIC, abyTmp, 8))
return TRUE;
return true;
else
return false;
}
6 changes: 3 additions & 3 deletions trunk/drivers/staging/vt6656/baseband.c
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength,
if (cbTmp != cbBitCount) {
cbUsCount ++;
if ((cbBitCount - cbTmp) <= 3)
bExtBit = TRUE;
bExtBit = true;
}
if (byPreambleType == 1)
*pbyPhySgn = 0x0b;
Expand Down Expand Up @@ -1097,7 +1097,7 @@ else {
MACvRegBitsOn(pDevice, MAC_REG_SOFTPWRCTL2, SOFTPWRCTL_RFLEOPT);
//}}
} else {
return TRUE;
return true;
}

memcpy(abyArray, pbyAddr, wLength);
Expand Down Expand Up @@ -1136,7 +1136,7 @@ else {
ControlvWriteByte(pDevice,MESSAGE_REQUEST_BBREG,0x0D,0x01);

RFbRFTableDownload(pDevice);
return TRUE;//ntStatus;
return true;//ntStatus;
}


Expand Down
Loading

0 comments on commit 5c71ce6

Please sign in to comment.