Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 206048
b: refs/heads/master
c: 1b12068
h: refs/heads/master
v: v3
  • Loading branch information
Charles Clément authored and Greg Kroah-Hartman committed Aug 3, 2010
1 parent 1c48a86 commit e6893ce
Show file tree
Hide file tree
Showing 32 changed files with 762 additions and 769 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: 93a94c42b1b4f455314230e6b343bc6a23f26854
refs/heads/master: 1b12068a804711ae2f4fd2876d5706542c1d7ad9
8 changes: 4 additions & 4 deletions trunk/drivers/staging/vt6655/80211mgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,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 @@ -404,7 +404,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 @@ -584,7 +584,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 @@ -779,7 +779,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
10 changes: 5 additions & 5 deletions trunk/drivers/staging/vt6655/IEEE11h.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ static BOOL s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq,
unsigned int uLength)
{
size_t uNumOfEIDs = 0;
BOOL bResult = TRUE;
BOOL bResult = true;

if (uLength <= WLAN_A3FR_MAXLEN) {
memcpy(pMgmt->abyCurrentMSRReq, pMSRReq, uLength);
Expand Down Expand Up @@ -177,7 +177,7 @@ static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, unsigned
pTxPacket->cbPayloadLen = sizeof(WLAN_FRAME_TPCREP) - WLAN_HDR_ADDR3_LEN;
if (csMgmt_xmit(pMgmt->pAdapter, pTxPacket) != CMD_STATUS_PENDING)
return (FALSE);
return (TRUE);
return (true);
// return (CARDbSendPacket(pMgmt->pAdapter, pFrame, PKT_TYPE_802_11_MNG, sizeof(WLAN_FRAME_TPCREP)));

}
Expand Down Expand Up @@ -260,9 +260,9 @@ IEEE11hbMgrRxAction (
pAction->byCategory |= 0x80;

//return (CARDbSendPacket(pMgmt->pAdapter, pAction, PKT_TYPE_802_11_MNG, uLength));
return (TRUE);
return (true);
}
return (TRUE);
return (true);
}


Expand Down Expand Up @@ -298,7 +298,7 @@ BOOL IEEE11hbMSRRepTx (
pTxPacket->cbPayloadLen = uLength - WLAN_HDR_ADDR3_LEN;
if (csMgmt_xmit(pMgmt->pAdapter, pTxPacket) != CMD_STATUS_PENDING)
return (FALSE);
return (TRUE);
return (true);
// return (CARDbSendPacket(pMgmt->pAdapter, pMSRRep, PKT_TYPE_802_11_MNG, uLength));

}
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/vt6655/aes_ccmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ int ii,jj,kk;
pbyIV = pbyFrame + WLAN_HDR_ADDR3_LEN;
if ( WLAN_GET_FC_TODS(*(unsigned short *)pbyFrame) &&
WLAN_GET_FC_FROMDS(*(unsigned short *)pbyFrame) ) {
bA4 = TRUE;
bA4 = true;
pbyIV += 6; // 6 is 802.11 address4
wHLen += 6;
wPayloadSize -= 6;
Expand Down Expand Up @@ -394,7 +394,7 @@ int ii,jj,kk;
//--------------------------------------------

if ( !memcmp(abyMIC,abyTmp,8) ) {
return TRUE;
return true;
} else {
return FALSE;
}
Expand Down
22 changes: 11 additions & 11 deletions trunk/drivers/staging/vt6655/baseband.c
Original file line number Diff line number Diff line change
Expand Up @@ -1740,13 +1740,13 @@ s_vChangeAntenna (
#endif
if ( pDevice->dwRxAntennaSel == 0) {
pDevice->dwRxAntennaSel=1;
if (pDevice->bTxRxAntInv == TRUE)
if (pDevice->bTxRxAntInv == true)
BBvSetRxAntennaMode(pDevice->PortOffset, ANT_A);
else
BBvSetRxAntennaMode(pDevice->PortOffset, ANT_B);
} else {
pDevice->dwRxAntennaSel=0;
if (pDevice->bTxRxAntInv == TRUE)
if (pDevice->bTxRxAntInv == true)
BBvSetRxAntennaMode(pDevice->PortOffset, ANT_B);
else
BBvSetRxAntennaMode(pDevice->PortOffset, ANT_A);
Expand Down Expand Up @@ -1900,7 +1900,7 @@ BBvCaculateParameter (
if (cbTmp != cbBitCount) {
cbUsCount ++;
if ((cbBitCount - cbTmp) <= 3)
bExtBit = TRUE;
bExtBit = true;
}
if (byPreambleType == 1)
*pbyPhySgn = 0x0b;
Expand Down Expand Up @@ -2012,7 +2012,7 @@ BBvCaculateParameter (
* Out:
* pbyData - data read
*
* Return Value: TRUE if succeeded; FALSE if failed.
* Return Value: true if succeeded; FALSE if failed.
*
*/
BOOL BBbReadEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char *pbyData)
Expand Down Expand Up @@ -2040,7 +2040,7 @@ BOOL BBbReadEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned ch
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x30)\n");
return FALSE;
}
return TRUE;
return true;
}


Expand All @@ -2055,7 +2055,7 @@ BOOL BBbReadEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned ch
* Out:
* none
*
* Return Value: TRUE if succeeded; FALSE if failed.
* Return Value: true if succeeded; FALSE if failed.
*
*/
BOOL BBbWriteEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byData)
Expand All @@ -2082,7 +2082,7 @@ BOOL BBbWriteEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned c
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x31)\n");
return FALSE;
}
return TRUE;
return true;
}


Expand All @@ -2097,7 +2097,7 @@ BOOL BBbWriteEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned c
* Out:
* none
*
* Return Value: TRUE if all TestBits are set; FALSE otherwise.
* Return Value: true if all TestBits are set; FALSE otherwise.
*
*/
BOOL BBbIsRegBitsOn (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits)
Expand All @@ -2120,7 +2120,7 @@ BOOL BBbIsRegBitsOn (unsigned long dwIoBase, unsigned char byBBAddr, unsigned ch
* Out:
* none
*
* Return Value: TRUE if all TestBits are clear; FALSE otherwise.
* Return Value: true if all TestBits are clear; FALSE otherwise.
*
*/
BOOL BBbIsRegBitsOff (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits)
Expand All @@ -2142,13 +2142,13 @@ BOOL BBbIsRegBitsOff (unsigned long dwIoBase, unsigned char byBBAddr, unsigned c
* Out:
* none
*
* Return Value: TRUE if succeeded; FALSE if failed.
* Return Value: true if succeeded; FALSE if failed.
*
*/

BOOL BBbVT3253Init (PSDevice pDevice)
{
BOOL bResult = TRUE;
BOOL bResult = true;
int ii;
unsigned long dwIoBase = pDevice->PortOffset;
unsigned char byRFType = pDevice->byRFType;
Expand Down
Loading

0 comments on commit e6893ce

Please sign in to comment.