Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 354524
b: refs/heads/master
c: e269fc2
h: refs/heads/master
v: v3
  • Loading branch information
Andres More authored and Greg Kroah-Hartman committed Feb 15, 2013
1 parent 8809a86 commit d69dd8b
Show file tree
Hide file tree
Showing 27 changed files with 483 additions and 486 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dfdcc425975d06cbfcc9b5c0fad2f3af5476cd05
refs/heads/master: e269fc2d129ade6543c22052755becf37e306e2a
4 changes: 2 additions & 2 deletions trunk/drivers/staging/vt6656/aes_ccmp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ bool AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize)
WORD wHLen = 22;
/* 8 is IV, 8 is MIC, 4 is CRC */
WORD wPayloadSize = wFrameSize - 8 - 8 - 4 - WLAN_HDR_ADDR3_LEN;
bool bA4 = FALSE;
bool bA4 = false;
BYTE byTmp;
WORD wCnt;
int ii, jj, kk;
Expand Down Expand Up @@ -382,5 +382,5 @@ bool AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize)
if (!memcmp(abyMIC, abyTmp, 8))
return TRUE;
else
return FALSE;
return false;
}
10 changes: 5 additions & 5 deletions trunk/drivers/staging/vt6656/baseband.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength,
int bCCK = pDevice->bCCK;

cbBitCount = cbFrameLength * 8;
bExtBit = FALSE;
bExtBit = false;

switch (wRate) {
case RATE_1M :
Expand All @@ -785,7 +785,7 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength,
break;

case RATE_5M :
if (bCCK == FALSE)
if (bCCK == false)
cbBitCount ++;
cbUsCount = (cbBitCount * 10) / 55;
cbTmp = (cbUsCount * 55) / 10;
Expand All @@ -799,7 +799,7 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength,

case RATE_11M :

if (bCCK == FALSE)
if (bCCK == false)
cbBitCount ++;
cbUsCount = cbBitCount / 11;
cbTmp = cbUsCount * 11;
Expand Down Expand Up @@ -976,12 +976,12 @@ int BBbVT3184Init(struct vnt_private *pDevice)
EEP_MAX_CONTEXT_SIZE,
pDevice->abyEEPROM);
if (ntStatus != STATUS_SUCCESS) {
return FALSE;
return false;
}


// if ((pDevice->abyEEPROM[EEP_OFS_RADIOCTL]&0x06)==0x04)
// return FALSE;
// return false;

//zonetype initial
pDevice->byOriginalZonetype = pDevice->abyEEPROM[EEP_OFS_ZONETYPE];
Expand Down
58 changes: 29 additions & 29 deletions trunk/drivers/staging/vt6656/bssdb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,15 @@ PKnownBSS BSSpSearchBSSList(struct vnt_private *pDevice,
}
}

if ((pbyBSSID != NULL)&&(pDevice->bRoaming == FALSE)) {
if ((pbyBSSID != NULL)&&(pDevice->bRoaming == false)) {
// match BSSID first
for (ii = 0; ii <MAX_BSS_NUM; ii++) {
pCurrBSS = &(pMgmt->sBSSList[ii]);

pCurrBSS->bSelected = FALSE;
pCurrBSS->bSelected = false;

if ((pCurrBSS->bActive) &&
(pCurrBSS->bSelected == FALSE)) {
(pCurrBSS->bSelected == false)) {
if (!compare_ether_addr(pCurrBSS->abyBSSID, pbyBSSID)) {
if (pSSID != NULL) {
// compare ssid
Expand Down Expand Up @@ -183,9 +183,9 @@ PKnownBSS BSSpSearchBSSList(struct vnt_private *pDevice,

//2007-0721-01<Mark>by MikeLiu
// if ((pCurrBSS->bActive) &&
// (pCurrBSS->bSelected == FALSE)) {
// (pCurrBSS->bSelected == false)) {

pCurrBSS->bSelected = FALSE;
pCurrBSS->bSelected = false;
if (pCurrBSS->bActive) {

if (pSSID != NULL) {
Expand Down Expand Up @@ -237,7 +237,7 @@ pDevice->bSameBSSMaxNum = jj;

if (pSelect != NULL) {
pSelect->bSelected = TRUE;
if (pDevice->bRoaming == FALSE) {
if (pDevice->bRoaming == false) {
// Einsn Add @20070907
memcpy(pbyDesireSSID,pCurrBSS->abySSID,WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1) ;
}
Expand Down Expand Up @@ -274,12 +274,12 @@ void BSSvClearBSSList(struct vnt_private *pDevice, int bKeepCurrBSSID)
//mike mark: there are two BSSID's in list. If that AP is in hidden ssid mode, one SSID is null,
// but other's might not be obvious, so if it associate's with your STA,
// you must keep the two of them!!
// bKeepCurrBSSID = FALSE;
// bKeepCurrBSSID = false;
continue;
}
}

pMgmt->sBSSList[ii].bActive = FALSE;
pMgmt->sBSSList[ii].bActive = false;
memset(&pMgmt->sBSSList[ii], 0, sizeof(KnownBSS));
}
BSSvClearAnyBSSJoinRecord(pDevice);
Expand Down Expand Up @@ -355,7 +355,7 @@ int BSSbInsertToBSSList(struct vnt_private *pDevice,
(struct vnt_rx_mgmt *)pRxPacketContext;
PKnownBSS pBSSList = NULL;
unsigned int ii;
bool bParsingQuiet = FALSE;
bool bParsingQuiet = false;


pBSSList = (PKnownBSS)&(pMgmt->sBSSList[0]);
Expand All @@ -368,7 +368,7 @@ int BSSbInsertToBSSList(struct vnt_private *pDevice,

if (ii == MAX_BSS_NUM){
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Get free KnowBSS node failed.\n");
return FALSE;
return false;
}
// save the BSS info
pBSSList->bActive = TRUE;
Expand Down Expand Up @@ -453,7 +453,7 @@ int BSSbInsertToBSSList(struct vnt_private *pDevice,
if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) || (pBSSList->bWPA2Valid == TRUE)) {

PSKeyItem pTransmitKey = NULL;
bool bIs802_1x = FALSE;
bool bIs802_1x = false;

for (ii = 0; ii < pBSSList->wAKMSSAuthCount; ii ++) {
if (pBSSList->abyAKMSSAuthType[ii] == WLAN_11i_AKMSS_802_1X) {
Expand Down Expand Up @@ -534,10 +534,10 @@ int BSSbUpdateToBSSList(struct vnt_private *pDevice,
(struct vnt_rx_mgmt *)pRxPacketContext;
int ii, jj;
signed long ldBm, ldBmSum;
bool bParsingQuiet = FALSE;
bool bParsingQuiet = false;

if (pBSSList == NULL)
return FALSE;
return false;


pBSSList->qwBSSTimestamp = cpu_to_le64(qwTimestamp);
Expand Down Expand Up @@ -669,7 +669,7 @@ int BSSbIsSTAInNodeDB(struct vnt_private *pDevice,
}
}

return FALSE;
return false;
};


Expand Down Expand Up @@ -826,7 +826,7 @@ void BSSvAddMulticastNode(struct vnt_private *pDevice)
memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB));
memset(pMgmt->sNodeDBTable[0].abyMACAddr, 0xff, WLAN_ADDR_LEN);
pMgmt->sNodeDBTable[0].bActive = TRUE;
pMgmt->sNodeDBTable[0].bPSEnable = FALSE;
pMgmt->sNodeDBTable[0].bPSEnable = false;
skb_queue_head_init(&pMgmt->sNodeDBTable[0].sTxPSQueue);
RATEvParseMaxRate((void *) pDevice,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
Expand Down Expand Up @@ -874,7 +874,7 @@ void BSSvSecondCallBack(struct vnt_private *pDevice)
pDevice->ulPSModeWaitTx++;
if ( pDevice->ulPSModeWaitTx >= 2 ) {
pDevice->ulPSModeWaitTx = 0;
pDevice->bPSModeTxBurst = FALSE;
pDevice->bPSModeTxBurst = false;
}
}

Expand Down Expand Up @@ -994,14 +994,14 @@ if(pDevice->byReAssocCount > 0) {
else {
if (pDevice->bProtectMode) {
MACvDisableProtectMD(pDevice);
pDevice->bProtectMode = FALSE;
pDevice->bProtectMode = false;
}
}
// on/off short slot time

if (uNonShortSlotSTACnt > 0) {
if (pDevice->bShortSlotTime) {
pDevice->bShortSlotTime = FALSE;
pDevice->bShortSlotTime = false;
BBvSetShortSlotTime(pDevice);
vUpdateIFS((void *)pDevice);
}
Expand All @@ -1025,7 +1025,7 @@ if(pDevice->byReAssocCount > 0) {
else {
if (pDevice->bBarkerPreambleMd) {
MACvDisableBarkerPreambleMd(pDevice);
pDevice->bBarkerPreambleMd = FALSE;
pDevice->bBarkerPreambleMd = false;
}
}

Expand All @@ -1037,7 +1037,7 @@ if(pDevice->byReAssocCount > 0) {
if (uSleepySTACnt > 0)
pMgmt->sNodeDBTable[0].bPSEnable = TRUE;
else
pMgmt->sNodeDBTable[0].bPSEnable = FALSE;
pMgmt->sNodeDBTable[0].bPSEnable = false;
}

pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID;
Expand All @@ -1062,14 +1062,14 @@ if(pDevice->byReAssocCount > 0) {
}

if (pMgmt->sNodeDBTable[0].uInActiveCount >= LOST_BEACON_COUNT) {
pMgmt->sNodeDBTable[0].bActive = FALSE;
pMgmt->sNodeDBTable[0].bActive = false;
pMgmt->eCurrMode = WMAC_MODE_STANDBY;
pMgmt->eCurrState = WMAC_STATE_IDLE;
netif_stop_queue(pDevice->dev);
pDevice->bLinkPass = FALSE;
pDevice->bLinkPass = false;
ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_PAPEDELAY,LEDSTS_STS,LEDSTS_SLOW);
pDevice->bRoaming = TRUE;
pDevice->bIsRoaming = FALSE;
pDevice->bIsRoaming = false;

DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost AP beacon [%d] sec, disconnected !\n", pMgmt->sNodeDBTable[0].uInActiveCount);
/* let wpa supplicant know AP may disconnect */
Expand Down Expand Up @@ -1098,12 +1098,12 @@ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bIsRoaming %d, !\n", pDevice->bIsRoaming );
pMgmt->abyDesireSSID);
pDevice->uAutoReConnectTime = 0;
pDevice->uIsroamingTime = 0;
pDevice->bRoaming = FALSE;
pDevice->bRoaming = false;
}
else if ((pDevice->bRoaming == FALSE)&&(pDevice->bIsRoaming == TRUE)) {
else if ((pDevice->bRoaming == false)&&(pDevice->bIsRoaming == TRUE)) {
pDevice->uIsroamingTime++;
if (pDevice->uIsroamingTime >= 20)
pDevice->bIsRoaming = FALSE;
pDevice->bIsRoaming = false;
}

}
Expand Down Expand Up @@ -1159,7 +1159,7 @@ else {
pMgmt->sNodeDBTable[0].uInActiveCount = 0;
pMgmt->eCurrState = WMAC_STATE_STARTED;
netif_stop_queue(pDevice->dev);
pDevice->bLinkPass = FALSE;
pDevice->bLinkPass = false;
ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_PAPEDELAY,LEDSTS_STS,LEDSTS_SLOW);
}
}
Expand Down Expand Up @@ -1459,7 +1459,7 @@ void BSSvClearAnyBSSJoinRecord(struct vnt_private *pDevice)
int ii;

for (ii = 0; ii < MAX_BSS_NUM; ii++)
pMgmt->sBSSList[ii].bSelected = FALSE;
pMgmt->sBSSList[ii].bSelected = false;

return;
}
Expand All @@ -1474,7 +1474,7 @@ static void s_vCheckPreEDThreshold(struct vnt_private *pDevice)
pBSSList = BSSpAddrIsInBSSList(pDevice, pMgmt->abyCurrBSSID, (PWLAN_IE_SSID)pMgmt->abyCurrSSID);
if (pBSSList != NULL) {
pDevice->byBBPreEDRSSI = (BYTE) (~(pBSSList->ldBmAverRange) + 1);
BBvUpdatePreEDThreshold(pDevice, FALSE);
BBvUpdatePreEDThreshold(pDevice, false);
}
}
}
Expand Down
22 changes: 11 additions & 11 deletions trunk/drivers/staging/vt6656/card.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ void vUpdateIFS(struct vnt_private *pDevice)
}
else {// PK_TYPE_11GA & PK_TYPE_11GB
BYTE byRate = 0;
bool bOFDMRate = FALSE;
bool bOFDMRate = false;
unsigned int ii = 0;
PWLAN_IE_SUPP_RATES pItemRates = NULL;

Expand All @@ -521,7 +521,7 @@ void vUpdateIFS(struct vnt_private *pDevice)
break;
}
}
if (bOFDMRate == FALSE) {
if (bOFDMRate == false) {
pItemRates = (PWLAN_IE_SUPP_RATES)pDevice->vnt_mgmt
.abyCurrExtSuppRates;
for (ii = 0; ii < pItemRates->len; ii++) {
Expand Down Expand Up @@ -599,7 +599,7 @@ void CARDvUpdateBasicTopRate(struct vnt_private *pDevice)
* Out:
* none
*
* Return Value: TRUE if succeeded; FALSE if failed.
* Return Value: TRUE if succeeded; false if failed.
*
*/
void CARDbAddBasicRate(struct vnt_private *pDevice, u16 wRateIdx)
Expand All @@ -620,7 +620,7 @@ int CARDbIsOFDMinBasicRate(struct vnt_private *pDevice)
if ((pDevice->wBasicRate) & ((WORD)(1<<ii)))
return TRUE;
}
return FALSE;
return false;
}

u8 CARDbyGetPktType(struct vnt_private *pDevice)
Expand Down Expand Up @@ -723,7 +723,7 @@ void CARDvAdjustTSF(struct vnt_private *pDevice, u8 byRxRate,
* Out:
* qwCurrTSF - Current TSF counter
*
* Return Value: TRUE if success; otherwise FALSE
* Return Value: TRUE if success; otherwise false
*
*/
bool CARDbGetCurrentTSF(struct vnt_private *pDevice, u64 *pqwCurrTSF)
Expand All @@ -743,7 +743,7 @@ bool CARDbGetCurrentTSF(struct vnt_private *pDevice, u64 *pqwCurrTSF)
* In:
* pDevice - The adapter to be read
*
* Return Value: TRUE if success; otherwise FALSE
* Return Value: TRUE if success; otherwise false
*
*/
bool CARDbClearCurrentTSF(struct vnt_private *pDevice)
Expand Down Expand Up @@ -899,7 +899,7 @@ void CARDvUpdateNextTBTT(struct vnt_private *pDevice, u64 qwTSF,
* Out:
* none
*
* Return Value: TRUE if success; otherwise FALSE
* Return Value: TRUE if success; otherwise false
*
*/
int CARDbRadioPowerOff(struct vnt_private *pDevice)
Expand Down Expand Up @@ -939,21 +939,21 @@ int CARDbRadioPowerOff(struct vnt_private *pDevice)
* Out:
* none
*
* Return Value: TRUE if success; otherwise FALSE
* Return Value: TRUE if success; otherwise false
*
*/
int CARDbRadioPowerOn(struct vnt_private *pDevice)
{
int bResult = TRUE;

if ((pDevice->bHWRadioOff == TRUE) || (pDevice->bRadioControlOff == TRUE)) {
return FALSE;
return false;
}

//if (pDevice->bRadioOff == FALSE)
//if (pDevice->bRadioOff == false)
// return TRUE;

pDevice->bRadioOff = FALSE;
pDevice->bRadioOff = false;

BBvExitDeepSleep(pDevice);

Expand Down
Loading

0 comments on commit d69dd8b

Please sign in to comment.