Signed-off-by: Charles Clément <caratorn@xxxxxxxxx> --- drivers/staging/vt6655/IEEE11h.c | 6 +- drivers/staging/vt6655/aes_ccmp.c | 4 +- drivers/staging/vt6655/baseband.c | 22 +++--- drivers/staging/vt6655/bssdb.c | 66 +++++++++-------- drivers/staging/vt6655/card.c | 106 ++++++++++++++-------------- drivers/staging/vt6655/channel.c | 28 ++++---- drivers/staging/vt6655/datarate.c | 4 +- drivers/staging/vt6655/device.h | 4 +- drivers/staging/vt6655/device_cfg.h | 4 - drivers/staging/vt6655/device_main.c | 132 +++++++++++++++++----------------- drivers/staging/vt6655/dpc.c | 88 +++++++++++----------- drivers/staging/vt6655/hostap.c | 26 ++++---- drivers/staging/vt6655/ioctl.c | 36 +++++----- drivers/staging/vt6655/iwctl.c | 48 ++++++------ drivers/staging/vt6655/key.c | 111 ++++++++++++++--------------- drivers/staging/vt6655/mac.c | 68 +++++++++--------- drivers/staging/vt6655/power.c | 36 +++++----- drivers/staging/vt6655/rf.c | 52 +++++++------- drivers/staging/vt6655/rxtx.c | 66 +++++++++--------- drivers/staging/vt6655/srom.c | 12 ++-- drivers/staging/vt6655/tether.c | 4 +- drivers/staging/vt6655/ttype.h | 4 - drivers/staging/vt6655/vntwifi.c | 18 +++--- drivers/staging/vt6655/wcmd.c | 46 ++++++------ drivers/staging/vt6655/wctl.c | 24 +++--- drivers/staging/vt6655/wmgr.c | 122 ++++++++++++++++---------------- drivers/staging/vt6655/wpa.c | 18 +++--- drivers/staging/vt6655/wpa2.c | 6 +- drivers/staging/vt6655/wpactl.c | 18 +++--- drivers/staging/vt6655/wroute.c | 14 ++-- 30 files changed, 591 insertions(+), 602 deletions(-) diff --git a/drivers/staging/vt6655/IEEE11h.c b/drivers/staging/vt6655/IEEE11h.c index 50fd72d..65f25d2 100644 --- a/drivers/staging/vt6655/IEEE11h.c +++ b/drivers/staging/vt6655/IEEE11h.c @@ -176,7 +176,7 @@ static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, unsigned pTxPacket->cbMPDULen = sizeof(WLAN_FRAME_TPCREP); pTxPacket->cbPayloadLen = sizeof(WLAN_FRAME_TPCREP) - WLAN_HDR_ADDR3_LEN; if (csMgmt_xmit(pMgmt->pAdapter, pTxPacket) != CMD_STATUS_PENDING) - return (FALSE); + return 0; return 1; // return (CARDbSendPacket(pMgmt->pAdapter, pFrame, PKT_TYPE_802_11_MNG, sizeof(WLAN_FRAME_TPCREP))); @@ -218,7 +218,7 @@ IEEE11hbMgrRxAction ( // decode the frame uLength = ((PSRxMgmtPacket)pRxPacket)->cbMPDULen; if (uLength > WLAN_A3FR_MAXLEN) { - return (FALSE); + return 0; } @@ -297,7 +297,7 @@ BOOL IEEE11hbMSRRepTx ( pTxPacket->cbMPDULen = uLength; pTxPacket->cbPayloadLen = uLength - WLAN_HDR_ADDR3_LEN; if (csMgmt_xmit(pMgmt->pAdapter, pTxPacket) != CMD_STATUS_PENDING) - return (FALSE); + return 0; return 1; // return (CARDbSendPacket(pMgmt->pAdapter, pMSRRep, PKT_TYPE_802_11_MNG, uLength)); diff --git a/drivers/staging/vt6655/aes_ccmp.c b/drivers/staging/vt6655/aes_ccmp.c index 581d64d..a9f5432 100644 --- a/drivers/staging/vt6655/aes_ccmp.c +++ b/drivers/staging/vt6655/aes_ccmp.c @@ -260,7 +260,7 @@ unsigned char *pbyIV; unsigned char *pbyPayload; unsigned short wHLen = 22; unsigned short wPayloadSize = wFrameSize - 8 - 8 - 4 - WLAN_HDR_ADDR3_LEN;//8 is IV, 8 is MIC, 4 is CRC -BOOL bA4 = FALSE; +BOOL bA4 = 0; unsigned char byTmp; unsigned short wCnt; int ii,jj,kk; @@ -396,7 +396,7 @@ int ii,jj,kk; if ( !memcmp(abyMIC,abyTmp,8) ) { return 1; } else { - return FALSE; + return 0; } } diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index bb6ba6b..d9d7f2f 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -1862,7 +1862,7 @@ BBvCaculateParameter ( BOOL bCCK = pDevice->bCCK; cbBitCount = cbFrameLength * 8; - bExtBit = FALSE; + bExtBit = 0; switch (wRate) { case RATE_1M : @@ -1879,7 +1879,7 @@ BBvCaculateParameter ( break; case RATE_5M : - if (bCCK == FALSE) + if (bCCK == 0) cbBitCount ++; cbUsCount = (cbBitCount * 10) / 55; cbTmp = (cbUsCount * 55) / 10; @@ -1893,7 +1893,7 @@ BBvCaculateParameter ( case RATE_11M : - if (bCCK == FALSE) + if (bCCK == 0) cbBitCount ++; cbUsCount = cbBitCount / 11; cbTmp = cbUsCount * 11; @@ -2012,7 +2012,7 @@ BBvCaculateParameter ( * Out: * pbyData - data read * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ BOOL BBbReadEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char *pbyData) @@ -2038,7 +2038,7 @@ BOOL BBbReadEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned ch if (ww == W_MAX_TIMEOUT) { DBG_PORT80(0x30); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x30)\n"); - return FALSE; + return 0; } return 1; } @@ -2055,7 +2055,7 @@ BOOL BBbReadEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned ch * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ BOOL BBbWriteEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byData) @@ -2080,7 +2080,7 @@ BOOL BBbWriteEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned c if (ww == W_MAX_TIMEOUT) { DBG_PORT80(0x31); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x31)\n"); - return FALSE; + return 0; } return 1; } @@ -2097,7 +2097,7 @@ BOOL BBbWriteEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned c * Out: * none * - * Return Value: 1 if all TestBits are set; FALSE otherwise. + * Return Value: 1 if all TestBits are set; 0 otherwise. * */ BOOL BBbIsRegBitsOn (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits) @@ -2120,7 +2120,7 @@ BOOL BBbIsRegBitsOn (unsigned long dwIoBase, unsigned char byBBAddr, unsigned ch * Out: * none * - * Return Value: 1 if all TestBits are clear; FALSE otherwise. + * Return Value: 1 if all TestBits are clear; 0 otherwise. * */ BOOL BBbIsRegBitsOff (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits) @@ -2142,7 +2142,7 @@ BOOL BBbIsRegBitsOff (unsigned long dwIoBase, unsigned char byBBAddr, unsigned c * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ @@ -2294,7 +2294,7 @@ BOOL BBbVT3253Init (PSDevice pDevice) //}} RobertYu } else { // No VGA Table now - pDevice->bUpdateBBVGA = FALSE; + pDevice->bUpdateBBVGA = 0; pDevice->abyBBVGA[0] = 0x1C; } diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c index cbdbe55..ee8bbf8 100644 --- a/drivers/staging/vt6655/bssdb.c +++ b/drivers/staging/vt6655/bssdb.c @@ -160,9 +160,10 @@ BSSpSearchBSSList( // match BSSID first for (ii = 0; ii <MAX_BSS_NUM; ii++) { pCurrBSS = &(pMgmt->sBSSList[ii]); -if(pDevice->bLinkPass==FALSE) pCurrBSS->bSelected = FALSE; + if(pDevice->bLinkPass == 0) + pCurrBSS->bSelected = 0; if ((pCurrBSS->bActive) && - (pCurrBSS->bSelected == FALSE)) { + (pCurrBSS->bSelected == 0)) { if (!compare_ether_addr(pCurrBSS->abyBSSID, pbyBSSID)) { if (pSSID != NULL) { // compare ssid @@ -194,7 +195,7 @@ if(pDevice->bLinkPass==FALSE) pCurrBSS->bSelected = FALSE; for (ii = 0; ii <MAX_BSS_NUM; ii++) { pCurrBSS = &(pMgmt->sBSSList[ii]); //2007-0721-01<Add>by MikeLiu - pCurrBSS->bSelected = FALSE; + pCurrBSS->bSelected = 0; if (pCurrBSS->bActive) { if (pSSID != NULL) { @@ -231,13 +232,13 @@ if(pDevice->bLinkPass==FALSE) pCurrBSS->bSelected = FALSE; } } else if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA) || (pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK)) { - if (pCurrBSS->bWPAValid == FALSE) { + if (pCurrBSS->bWPAValid == 0) { // station with WPA enable can't join NonWPA AP. continue; } } else if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) || (pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) { - if (pCurrBSS->bWPA2Valid == FALSE) { + if (pCurrBSS->bWPA2Valid == 0) { // station with WPA2 enable can't join NonWPA2 AP. continue; } @@ -256,7 +257,7 @@ if(pDevice->bLinkPass==FALSE) pCurrBSS->bSelected = FALSE; if (pSelect != NULL) { pSelect->bSelected = 1; /* - if (pDevice->bRoaming == FALSE) { + if (pDevice->bRoaming == 0) { // Einsn Add @20070907 memset(pbyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); memcpy(pbyDesireSSID,pCurrBSS->abySSID,WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1) ; @@ -295,7 +296,7 @@ BSSvClearBSSList( if (bKeepCurrBSSID) { if (pMgmt->sBSSList[ii].bActive && !compare_ether_addr(pMgmt->sBSSList[ii].abyBSSID, pMgmt->abyCurrBSSID)) { - // bKeepCurrBSSID = FALSE; + // bKeepCurrBSSID = 0; continue; } } @@ -305,7 +306,7 @@ BSSvClearBSSList( continue; } - pMgmt->sBSSList[ii].bActive = FALSE; + pMgmt->sBSSList[ii].bActive = 0; memset(&pMgmt->sBSSList[ii], 0, sizeof(KnownBSS)); } BSSvClearAnyBSSJoinRecord(pDevice); @@ -394,7 +395,7 @@ BSSbInsertToBSSList ( PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext; PKnownBSS pBSSList = NULL; unsigned int ii; - BOOL bParsingQuiet = FALSE; + BOOL bParsingQuiet = 0; PWLAN_IE_QUIET pQuiet = NULL; @@ -409,7 +410,7 @@ BSSbInsertToBSSList ( if (ii == MAX_BSS_NUM){ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Get free KnowBSS node failed.\n"); - return FALSE; + return 0; } // save the BSS info pBSSList->bActive = 1; @@ -492,7 +493,7 @@ BSSbInsertToBSSList ( if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) || (pBSSList->bWPA2Valid == 1)) { PSKeyItem pTransmitKey = NULL; - BOOL bIs802_1x = FALSE; + BOOL bIs802_1x = 0; for (ii = 0; ii < pBSSList->wAKMSSAuthCount; ii ++) { if (pBSSList->abyAKMSSAuthType[ii] == WLAN_11i_AKMSS_802_1X) { @@ -548,7 +549,7 @@ BSSbInsertToBSSList ( } else { pQuiet = (PWLAN_IE_QUIET)pIE_Quiet; CARDbSetQuiet( pMgmt->pAdapter, - FALSE, + 0, pQuiet->byQuietCount, pQuiet->byQuietPeriod, *((unsigned short *)pQuiet->abyQuietDuration), @@ -610,13 +611,13 @@ BSSbUpdateToBSSList ( PSMgmtObject pMgmt = pDevice->pMgmt; PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext; long ldBm; - BOOL bParsingQuiet = FALSE; + BOOL bParsingQuiet = 0; PWLAN_IE_QUIET pQuiet = NULL; if (pBSSList == NULL) - return FALSE; + return 0; HIDWORD(pBSSList->qwBSSTimestamp) = cpu_to_le32(HIDWORD(qwTimestamp)); @@ -724,7 +725,7 @@ BSSbUpdateToBSSList ( } else { pQuiet = (PWLAN_IE_QUIET)pIE_Quiet; CARDbSetQuiet( pMgmt->pAdapter, - FALSE, + 0, pQuiet->byQuietCount, pQuiet->byQuietPeriod, *((unsigned short *)pQuiet->abyQuietDuration), @@ -778,7 +779,7 @@ BSSDBbIsSTAInNodeDB(void *pMgmtObject, unsigned char *abyDstAddr, } } - return FALSE; + return 0; }; @@ -963,7 +964,7 @@ BSSvAddMulticastNode( memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB)); memset(pMgmt->sNodeDBTable[0].abyMACAddr, 0xff, WLAN_ADDR_LEN); pMgmt->sNodeDBTable[0].bActive = 1; - pMgmt->sNodeDBTable[0].bPSEnable = FALSE; + pMgmt->sNodeDBTable[0].bPSEnable = 0; skb_queue_head_init(&pMgmt->sNodeDBTable[0].sTxPSQueue); RATEvParseMaxRate((void *)pDevice, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, @@ -1001,7 +1002,7 @@ BSSvAddMulticastNode( -*/ //2008-4-14 <add> by chester for led issue #ifdef FOR_LED_ON_NOTEBOOK -BOOL cc=FALSE; +BOOL cc = 0; unsigned int status; #endif void @@ -1027,7 +1028,8 @@ BSSvSecondCallBack( //2008-4-14 <add> by chester for led issue #ifdef FOR_LED_ON_NOTEBOOK MACvGPIOIn(pDevice->PortOffset, &pDevice->byGPIO); -if ((( !(pDevice->byGPIO & GPIO0_DATA)&&(pDevice->bHWRadioOff == FALSE))||((pDevice->byGPIO & GPIO0_DATA)&&(pDevice->bHWRadioOff == 1)))&&(cc==FALSE)){ +if ((( !(pDevice->byGPIO & GPIO0_DATA) && (pDevice->bHWRadioOff == 0)) + || ((pDevice->byGPIO & GPIO0_DATA) && (pDevice->bHWRadioOff == 1))) && (cc == 0)){ cc = 1; } else if(cc == 1){ @@ -1038,11 +1040,11 @@ if(pDevice->bHWRadioOff == 1){ {if(status==1) goto start; status=1; CARDbRadioPowerOff(pDevice); - pMgmt->sNodeDBTable[0].bActive = FALSE; + pMgmt->sNodeDBTable[0].bActive = 0; pMgmt->eCurrMode = WMAC_MODE_STANDBY; pMgmt->eCurrState = WMAC_STATE_IDLE; //netif_stop_queue(pDevice->dev); - pDevice->bLinkPass = FALSE; + pDevice->bLinkPass = 0; } if (pDevice->byGPIO &GPIO0_DATA) @@ -1057,11 +1059,11 @@ else{ {if(status==3) goto start; status=3; CARDbRadioPowerOff(pDevice); - pMgmt->sNodeDBTable[0].bActive = FALSE; + pMgmt->sNodeDBTable[0].bActive = 0; pMgmt->eCurrMode = WMAC_MODE_STANDBY; pMgmt->eCurrState = WMAC_STATE_IDLE; //netif_stop_queue(pDevice->dev); - pDevice->bLinkPass = FALSE; + pDevice->bLinkPass = 0; } if ( !(pDevice->byGPIO & GPIO0_DATA)) @@ -1199,14 +1201,14 @@ start: else { if (pDevice->bProtectMode) { MACvDisableProtectMD(pDevice->PortOffset); - pDevice->bProtectMode = FALSE; + pDevice->bProtectMode = 0; } } // on/off short slot time if (uNonShortSlotSTACnt > 0) { if (pDevice->bShortSlotTime) { - pDevice->bShortSlotTime = FALSE; + pDevice->bShortSlotTime = 0; BBvSetShortSlotTime(pDevice); vUpdateIFS((void *)pDevice); } @@ -1230,7 +1232,7 @@ start: else { if (pDevice->bBarkerPreambleMd) { MACvDisableBarkerPreambleMd(pDevice->PortOffset); - pDevice->bBarkerPreambleMd = FALSE; + pDevice->bBarkerPreambleMd = 0; } } @@ -1242,7 +1244,7 @@ start: if (uSleepySTACnt > 0) pMgmt->sNodeDBTable[0].bPSEnable = 1; else - pMgmt->sNodeDBTable[0].bPSEnable = FALSE; + pMgmt->sNodeDBTable[0].bPSEnable = 0; } pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID; @@ -1269,11 +1271,11 @@ start: } if (pMgmt->sNodeDBTable[0].uInActiveCount >= LOST_BEACON_COUNT) { - pMgmt->sNodeDBTable[0].bActive = FALSE; + pMgmt->sNodeDBTable[0].bActive = 0; pMgmt->eCurrMode = WMAC_MODE_STANDBY; pMgmt->eCurrState = WMAC_STATE_IDLE; netif_stop_queue(pDevice->dev); - pDevice->bLinkPass = FALSE; + pDevice->bLinkPass = 0; pDevice->bRoaming = 1; DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost AP beacon [%d] sec, disconnected !\n", pMgmt->sNodeDBTable[0].uInActiveCount); if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) { @@ -1351,7 +1353,7 @@ start: pMgmt->sNodeDBTable[0].uInActiveCount = 0; pMgmt->eCurrState = WMAC_STATE_STARTED; netif_stop_queue(pDevice->dev); - pDevice->bLinkPass = FALSE; + pDevice->bLinkPass = 0; } } } @@ -1662,7 +1664,7 @@ BSSvClearAnyBSSJoinRecord ( unsigned int ii; for (ii = 0; ii < MAX_BSS_NUM; ii++) { - pMgmt->sBSSList[ii].bSelected = FALSE; + pMgmt->sBSSList[ii].bSelected = 0; } return; } @@ -1729,7 +1731,7 @@ void s_vCheckPreEDThreshold( pBSSList = BSSpAddrIsInBSSList(pDevice, pMgmt->abyCurrBSSID, (PWLAN_IE_SSID)pMgmt->abyCurrSSID); if (pBSSList != NULL) { pDevice->byBBPreEDRSSI = (unsigned char) (~(pBSSList->ldBmAverRange) + 1); - //BBvUpdatePreEDThreshold(pDevice, FALSE); + //BBvUpdatePreEDThreshold(pDevice, 0); } } return; diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 595ab3c..bdb0315 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -365,7 +365,7 @@ s_vSetRSPINF (PSDevice pDevice, CARD_PHY_TYPE ePHYType, void *pvSupportRateIEs, * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ /* @@ -394,14 +394,14 @@ BOOL CARDbSendPacket (void *pDeviceHandler, void *pPacket, CARD_PKT_TYPE ePktTyp * Out: * none * - * Return Value: 1 if short preamble; otherwise FALSE + * Return Value: 1 if short preamble; otherwise 0 * */ BOOL CARDbIsShortPreamble (void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; if (pDevice->byPreambleType == 0) { - return(FALSE); + return 0; } return 1; } @@ -415,7 +415,7 @@ BOOL CARDbIsShortPreamble (void *pDeviceHandler) * Out: * none * - * Return Value: 1 if short slot time; otherwise FALSE + * Return Value: 1 if short slot time; otherwise 0 * */ BOOL CARDbIsShorSlotTime (void *pDeviceHandler) @@ -589,7 +589,7 @@ BOOL CARDbSetPhyParameter (void *pDeviceHandler, CARD_PHY_TYPE ePHYType, unsigne if (pDevice->bySlot == C_SLOT_SHORT) { pDevice->bShortSlotTime = 1; } else { - pDevice->bShortSlotTime = FALSE; + pDevice->bShortSlotTime = 0; } BBvSetShortSlotTime(pDevice); } @@ -656,7 +656,7 @@ BOOL CARDbUpdateTSF (void *pDeviceHandler, unsigned char byRxRate, QWORD qwBSSTi * Out: * none * - * Return Value: 1 if succeed; otherwise FALSE + * Return Value: 1 if succeed; otherwise 0 * */ BOOL CARDbSetBeaconPeriod (void *pDeviceHandler, unsigned short wBeaconInterval) @@ -710,7 +710,7 @@ BOOL CARDbSetBeaconPeriod (void *pDeviceHandler, unsigned short wBeaconInterval) * Out: * none * - * Return Value: 1 if all data packet complete; otherwise FALSE. + * Return Value: 1 if all data packet complete; otherwise 0. * */ BOOL CARDbStopTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) @@ -734,23 +734,23 @@ BOOL CARDbStopTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) if (pDevice->bIsBeaconBufReadySet == 1) { if (pDevice->cbBeaconBufReadySetCnt < WAIT_BEACON_TX_DOWN_TMO) { pDevice->cbBeaconBufReadySetCnt ++; - return(FALSE); + return 0; } } - pDevice->bIsBeaconBufReadySet = FALSE; + pDevice->bIsBeaconBufReadySet = 0; pDevice->cbBeaconBufReadySetCnt = 0; MACvRegBitsOff(pDevice->PortOffset, MAC_REG_TCR, TCR_AUTOBCNTX); } // wait all TD0 complete if (pDevice->bStopTx0Pkt == 1) { if (pDevice->iTDUsed[TYPE_TXDMA0] != 0){ - return(FALSE); + return 0; } } // wait all Data TD complete if (pDevice->bStopDataPkt == 1) { if (pDevice->iTDUsed[TYPE_AC0DMA] != 0){ - return(FALSE); + return 0; } } @@ -768,7 +768,7 @@ BOOL CARDbStopTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) * Out: * none * - * Return Value: 1 if success; FALSE if failed. + * Return Value: 1 if success; 0 if failed. * */ BOOL CARDbStartTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) @@ -777,18 +777,18 @@ BOOL CARDbStartTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) if (ePktType == PKT_TYPE_802_11_ALL) { - pDevice->bStopBeacon = FALSE; - pDevice->bStopTx0Pkt = FALSE; - pDevice->bStopDataPkt = FALSE; + pDevice->bStopBeacon = 0; + pDevice->bStopTx0Pkt = 0; + pDevice->bStopDataPkt = 0; } else if (ePktType == PKT_TYPE_802_11_BCN) { - pDevice->bStopBeacon = FALSE; + pDevice->bStopBeacon = 0; } else if (ePktType == PKT_TYPE_802_11_MNG) { - pDevice->bStopTx0Pkt = FALSE; + pDevice->bStopTx0Pkt = 0; } else if (ePktType == PKT_TYPE_802_11_DATA) { - pDevice->bStopDataPkt = FALSE; + pDevice->bStopDataPkt = 0; } - if ((pDevice->bStopBeacon == FALSE) && + if ((pDevice->bStopBeacon == 0) && (pDevice->bBeaconBufReady == 1) && (pDevice->eOPMode == OP_MODE_ADHOC)) { MACvRegBitsOn(pDevice->PortOffset, MAC_REG_TCR, TCR_AUTOBCNTX); @@ -810,7 +810,7 @@ BOOL CARDbStartTxPacket (void *pDeviceHandler, CARD_PKT_TYPE ePktType) * Out: * none * - * Return Value: 1 if success; FALSE if failed. + * Return Value: 1 if success; 0 if failed. * */ BOOL CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE eOPMode) @@ -831,11 +831,11 @@ BOOL CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE e } if (eOPMode == OP_MODE_UNKNOWN) { MACvRegBitsOff(pDevice->PortOffset, MAC_REG_RCR, RCR_BSSID); - pDevice->bBSSIDFilter = FALSE; + pDevice->bBSSIDFilter = 0; pDevice->byRxMode &= ~RCR_BSSID; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wcmd: rx_mode = %x\n", pDevice->byRxMode ); } else { - if (is_zero_ether_addr(pDevice->abyBSSID) == FALSE) { + if (is_zero_ether_addr(pDevice->abyBSSID) == 0) { MACvRegBitsOn(pDevice->PortOffset, MAC_REG_RCR, RCR_BSSID); pDevice->bBSSIDFilter = 1; pDevice->byRxMode |= RCR_BSSID; @@ -858,7 +858,7 @@ BOOL CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE e * Out: * none * - * Return Value: 1 if success; FALSE if failed. + * Return Value: 1 if success; 0 if failed. * */ @@ -879,7 +879,7 @@ BOOL CARDbSetBSSID(void *pDeviceHandler, unsigned char *pbyBSSID, CARD_OP_MODE e * Out: * none * - * Return Value: 1 if succeed; otherwise FALSE + * Return Value: 1 if succeed; otherwise 0 * */ BOOL CARDbSetTxDataRate( @@ -904,7 +904,7 @@ BOOL CARDbSetTxDataRate( * Out: * none * - * Return Value: 1 if power down success; otherwise FALSE + * Return Value: 1 if power down success; otherwise 0 * -*/ BOOL @@ -926,7 +926,7 @@ CARDbPowerDown( for (uIdx = 0; uIdx < TYPE_MAXTD; uIdx ++) { if (pDevice->iTDUsed[uIdx] != 0) - return FALSE; + return 0; } MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_GO2DOZE); @@ -943,7 +943,7 @@ CARDbPowerDown( * Out: * none * - * Return Value: 1 if success; otherwise FALSE + * Return Value: 1 if success; otherwise 0 * */ BOOL CARDbRadioPowerOff (void *pDeviceHandler) @@ -992,7 +992,7 @@ MACvRegBitsOn(pDevice->PortOffset, MAC_REG_GPIOCTL0, LED_ACTSET); //LED issue * Out: * none * - * Return Value: 1 if success; otherwise FALSE + * Return Value: 1 if success; otherwise 0 * */ BOOL CARDbRadioPowerOn (void *pDeviceHandler) @@ -1003,9 +1003,9 @@ printk("chester power on\n"); if (pDevice->bRadioControlOff == 1){ if (pDevice->bHWRadioOff == 1) printk("chester bHWRadioOff\n"); if (pDevice->bRadioControlOff == 1) printk("chester bRadioControlOff\n"); - return FALSE;} + return 0;} - if (pDevice->bRadioOff == FALSE) + if (pDevice->bRadioOff == 0) { printk("chester pbRadioOff\n"); return 1;} @@ -1030,7 +1030,7 @@ return 1;} } - pDevice->bRadioOff = FALSE; + pDevice->bRadioOff = 0; // 2007-0409-03,<Add> by chester printk("chester power on\n"); MACvRegBitsOff(pDevice->PortOffset, MAC_REG_GPIOCTL0, LED_ACTSET); //LED issue @@ -1159,7 +1159,7 @@ CARDbStartMeasure ( } CARDbGetCurrentTSF(pDevice->PortOffset, &qwCurrTSF); if (pDevice->bMeasureInProgress == 1) { - pDevice->bMeasureInProgress = FALSE; + pDevice->bMeasureInProgress = 0; VNSvOutPortB(pDevice->PortOffset + MAC_REG_RCR, pDevice->byOrgRCR); MACvSelectPage1(pDevice->PortOffset); VNSvOutPortD(pDevice->PortOffset + MAC_REG_MAR0, pDevice->dwOrgMAR0); @@ -1192,7 +1192,7 @@ CARDbStartMeasure ( if (LODWORD(qwCurrTSF) > LODWORD(qwStartTSF)) { HIDWORD(qwStartTSF)++; } - bExpired = FALSE; + bExpired = 0; break; } else { // start at setting start TSF - 1TU(for channel switching) @@ -1206,11 +1206,11 @@ CARDbStartMeasure ( ((HIDWORD(qwCurrTSF) == HIDWORD(qwStartTSF)) && (LODWORD(qwCurrTSF) < LODWORD(qwStartTSF))) ) { - bExpired = FALSE; + bExpired = 0; break; } VNTWIFIbMeasureReport( pDevice->pMgmt, - FALSE, + 0, pDevice->pCurrMeasureEID, MEASURE_MODE_LATE, pDevice->byBasicMap, @@ -1220,7 +1220,7 @@ CARDbStartMeasure ( } else { // hardware do not support measure VNTWIFIbMeasureReport( pDevice->pMgmt, - FALSE, + 0, pDevice->pCurrMeasureEID, MEASURE_MODE_INCAPABLE, pDevice->byBasicMap, @@ -1230,7 +1230,7 @@ CARDbStartMeasure ( } } while (pDevice->uNumOfMeasureEIDs != 0); - if (bExpired == FALSE) { + if (bExpired == 0) { MACvSelectPage1(pDevice->PortOffset); VNSvOutPortD(pDevice->PortOffset + MAC_REG_MSRSTART, LODWORD(qwStartTSF)); VNSvOutPortD(pDevice->PortOffset + MAC_REG_MSRSTART + 4, HIDWORD(qwStartTSF)); @@ -1325,14 +1325,14 @@ CARDbSetQuiet ( if (bResetQuiet == 1) { MACvRegBitsOff(pDevice->PortOffset, MAC_REG_MSRCTL, (MSRCTL_QUIETTXCHK | MSRCTL_QUIETEN)); for(ii=0;ii<MAX_QUIET_COUNT;ii++) { - pDevice->sQuiet[ii].bEnable = FALSE; + pDevice->sQuiet[ii].bEnable = 0; } pDevice->uQuietEnqueue = 0; - pDevice->bEnableFirstQuiet = FALSE; - pDevice->bQuietEnable = FALSE; + pDevice->bEnableFirstQuiet = 0; + pDevice->bQuietEnable = 0; pDevice->byQuietStartCount = byQuietCount; } - if (pDevice->sQuiet[pDevice->uQuietEnqueue].bEnable == FALSE) { + if (pDevice->sQuiet[pDevice->uQuietEnqueue].bEnable == 0) { pDevice->sQuiet[pDevice->uQuietEnqueue].bEnable = 1; pDevice->sQuiet[pDevice->uQuietEnqueue].byPeriod = byQuietPeriod; pDevice->sQuiet[pDevice->uQuietEnqueue].wDuration = wQuietDuration; @@ -1387,10 +1387,10 @@ CARDbStartQuiet ( } if (dwStartTime == 0xFFFFFFFF) { // no more quiet - pDevice->bQuietEnable = FALSE; + pDevice->bQuietEnable = 0; MACvRegBitsOff(pDevice->PortOffset, MAC_REG_MSRCTL, (MSRCTL_QUIETTXCHK | MSRCTL_QUIETEN)); } else { - if (pDevice->bQuietEnable == FALSE) { + if (pDevice->bQuietEnable == 0) { // first quiet pDevice->byQuietStartCount--; dwNextTime = pDevice->sQuiet[uCurrentQuietIndex].dwStartTime; @@ -1399,7 +1399,7 @@ CARDbStartQuiet ( VNSvOutPortW(pDevice->PortOffset + MAC_REG_QUIETINIT, (unsigned short) dwNextTime); VNSvOutPortW(pDevice->PortOffset + MAC_REG_QUIETDUR, (unsigned short) pDevice->sQuiet[uCurrentQuietIndex].wDuration); if (pDevice->byQuietStartCount == 0) { - pDevice->bEnableFirstQuiet = FALSE; + pDevice->bEnableFirstQuiet = 0; MACvRegBitsOn(pDevice->PortOffset, MAC_REG_MSRCTL, (MSRCTL_QUIETTXCHK | MSRCTL_QUIETEN)); } else { pDevice->bEnableFirstQuiet = 1; @@ -1410,8 +1410,8 @@ CARDbStartQuiet ( // overlap with previous Quiet dwGap = pDevice->dwCurrentQuietEndTime - pDevice->sQuiet[uCurrentQuietIndex].dwStartTime; if (dwGap >= pDevice->sQuiet[uCurrentQuietIndex].wDuration) { - // return FALSE to indicate next quiet expired, should call this function again - return (FALSE); + // return 0 to indicate next quiet expired, should call this function again + return 0; } dwDuration = pDevice->sQuiet[uCurrentQuietIndex].wDuration - dwGap; dwGap = 0; @@ -1431,7 +1431,7 @@ CARDbStartQuiet ( pDevice->dwCurrentQuietEndTime += pDevice->sQuiet[uCurrentQuietIndex].wDuration; if (pDevice->sQuiet[uCurrentQuietIndex].byPeriod == 0) { // not period disable current quiet element - pDevice->sQuiet[uCurrentQuietIndex].bEnable = FALSE; + pDevice->sQuiet[uCurrentQuietIndex].bEnable = 0; } else { // set next period start time dwNextTime = (unsigned long) pDevice->sQuiet[uCurrentQuietIndex].byPeriod; @@ -1943,7 +1943,7 @@ void CARDvUpdateBasicTopRate (void *pDeviceHandler) * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ BOOL CARDbAddBasicRate (void *pDeviceHandler, unsigned short wRateIdx) @@ -1968,7 +1968,7 @@ BOOL CARDbIsOFDMinBasicRate (void *pDeviceHandler) if ((pDevice->wBasicRate) & ((unsigned short)(1<<ii))) return 1; } - return FALSE; + return 0; } unsigned char CARDbyGetPktType (void *pDeviceHandler) @@ -2007,7 +2007,7 @@ void CARDvSetLoopbackMode (unsigned long dwIoBase, unsigned short wLoopbackMode) case CARD_LB_PHY: break; default: - ASSERT(FALSE); + ASSERT(0); break; } // set MAC loopback @@ -2034,7 +2034,7 @@ BOOL CARDbSoftwareReset (void *pDeviceHandler) // reset MAC if (!MACbSafeSoftwareReset(pDevice->PortOffset)) - return FALSE; + return 0; return 1; } @@ -2089,7 +2089,7 @@ QWORD CARDqGetTSFOffset (unsigned char byRxRate, QWORD qwTSF1, QWORD qwTSF2) * Out: * qwCurrTSF - Current TSF counter * - * Return Value: 1 if success; otherwise FALSE + * Return Value: 1 if success; otherwise 0 * */ BOOL CARDbGetCurrentTSF (unsigned long dwIoBase, PQWORD pqwCurrTSF) @@ -2104,7 +2104,7 @@ BOOL CARDbGetCurrentTSF (unsigned long dwIoBase, PQWORD pqwCurrTSF) break; } if (ww == W_MAX_TIMEOUT) - return(FALSE); + return 0; VNSvInPortD(dwIoBase + MAC_REG_TSFCNTR, &LODWORD(*pqwCurrTSF)); VNSvInPortD(dwIoBase + MAC_REG_TSFCNTR + 4, &HIDWORD(*pqwCurrTSF)); diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c index 0c9e7a3..8788f43 100644 --- a/drivers/staging/vt6655/channel.c +++ b/drivers/staging/vt6655/channel.c @@ -37,7 +37,7 @@ static int msglevel = MSG_LEVEL_INFO; static SChannelTblElement sChannelTbl[CARD_MAX_CHANNEL_TBL + 1] = { - {0, 0, FALSE, 0}, + {0, 0, 0, 0}, {1, 2412, 1, 0}, {2, 2417, 1, 0}, {3, 2422, 1, 0}, @@ -366,7 +366,7 @@ static struct * 16 = 4.9G channel 184 * ..... * Output: 1 if the specified 5GHz band is allowed to be used, - * FALSE otherwise. + * 0 otherwise. * 4.9G => Ch 183, 184, 185, 187, 188, 189, 192, 196 (Value:15 ~ 22) * * 5G => Ch 7, 8, 9, 11, 12, 16, 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64, @@ -377,14 +377,14 @@ BOOL is_channel_valid(unsigned int ChannelIndex) { BOOL bValid; - bValid = FALSE; + bValid = 0; /* * If Channel Index is invalid, return invalid */ if ((ChannelIndex > CB_MAX_CHANNEL) || (ChannelIndex == 0)) { - bValid = FALSE; + bValid = 0; goto exit; } @@ -410,7 +410,7 @@ exit: BOOL channel_get_list(unsigned int uCountryCodeIdx, unsigned char *pbyChannelTable) { if (uCountryCodeIdx >= CCODE_MAX) - return (FALSE); + return 0; memcpy(pbyChannelTable, ChannelRuleTab[uCountryCodeIdx].bChannelIdxList, CB_MAX_CHANNEL); @@ -420,11 +420,11 @@ BOOL channel_get_list(unsigned int uCountryCodeIdx, unsigned char *pbyChannelTab void init_channel_table(void *pDeviceHandler) { PSDevice pDevice = (PSDevice) pDeviceHandler; - BOOL bMultiBand = FALSE; + BOOL bMultiBand = 0; unsigned int ii; for(ii = 1 ; ii<=CARD_MAX_CHANNEL_TBL ; ii++) { - sChannelTbl[ii].bValid = FALSE; + sChannelTbl[ii].bValid = 0; } switch (pDevice->byRFType) { @@ -434,7 +434,7 @@ void init_channel_table(void *pDeviceHandler) case RF_UW2451 : case RF_VT3226 : //printk("chester-false\n"); - bMultiBand = FALSE; + bMultiBand = 0; break; case RF_AIROHA7230 : case RF_UW2452 : @@ -522,7 +522,7 @@ unsigned char get_channel_number(void *pDeviceHandler, unsigned char byChannelIn * @pDeviceHandler: The adapter to be set * @uConnectionChannel: Channel to be set * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ BOOL set_channel (void *pDeviceHandler, unsigned int uConnectionChannel) @@ -535,8 +535,8 @@ BOOL set_channel (void *pDeviceHandler, unsigned int uConnectionChannel) return bResult; } - if (sChannelTbl[uConnectionChannel].bValid == FALSE) { - return (FALSE); + if (sChannelTbl[uConnectionChannel].bValid == 0) { + return 0; } if ((uConnectionChannel > CB_MAX_CHANNEL_24G) && @@ -619,13 +619,13 @@ void set_country_info(void *pDeviceHandler, CARD_PHY_TYPE ePHYType, void *pIE) if (ePHYType == PHY_TYPE_11A) { pDevice->bCountryInfo5G = 1; for(ii = CB_MAX_CHANNEL_24G + 1 ; ii <= CARD_MAX_CHANNEL_TBL ; ii++) { - sChannelTbl[ii].bValid = FALSE; + sChannelTbl[ii].bValid = 0; } step = 4; } else { pDevice->bCountryInfo24G = 1; for(ii = 1 ; ii <= CB_MAX_CHANNEL_24G ; ii++) { - sChannelTbl[ii].bValid = FALSE; + sChannelTbl[ii].bValid = 0; } step = 1; } @@ -750,7 +750,7 @@ BOOL get_channel_map_info(void *pDeviceHandler, unsigned int uChannelIndex, { if (uChannelIndex > CB_MAX_CHANNEL) { - return FALSE; + return 0; } *pbyChannelNumber = sChannelTbl[uChannelIndex].byChannelNumber; *pbyMap = sChannelTbl[uChannelIndex].byMAP; diff --git a/drivers/staging/vt6655/datarate.c b/drivers/staging/vt6655/datarate.c index d14519c..5d8f5f2 100644 --- a/drivers/staging/vt6655/datarate.c +++ b/drivers/staging/vt6655/datarate.c @@ -317,7 +317,7 @@ PSDevice pDevice = (PSDevice) pDeviceHandler; unsigned short wIdxDownRate = 0; unsigned int ii; //unsigned long dwRateTable[MAX_RATE] = {1, 2, 5, 11, 6, 9, 12, 18, 24, 36, 48, 54}; -BOOL bAutoRate[MAX_RATE] = {1, 1, 1, 1,FALSE,FALSE, 1, 1, 1, 1, 1, 1}; +BOOL bAutoRate[MAX_RATE] = {1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1}; unsigned long dwThroughputTbl[MAX_RATE] = {10, 20, 55, 110, 60, 90, 120, 180, 240, 360, 480, 540}; unsigned long dwThroughput = 0; unsigned short wIdxUpRate = 0; @@ -350,7 +350,7 @@ BOOL bAutoRate[MAX_RATE] = {1, 1, 1, 1,FALSE,FALSE, 1, 1, 1, 1, 1, 1}; wIdxUpRate = (unsigned short) ii; } } else { - bAutoRate[ii] = FALSE; + bAutoRate[ii] = 0; } } diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index e65026f..77eaf76 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -891,11 +891,9 @@ inline static BOOL device_get_ip(PSDevice pInfo) { return 1; } } - return FALSE; + return 0; } - - static inline PDEVICE_RD_INFO alloc_rd_info(void) { PDEVICE_RD_INFO ptr; ptr = (PDEVICE_RD_INFO)kmalloc((int)sizeof(DEVICE_RD_INFO), (int)GFP_ATOMIC); diff --git a/drivers/staging/vt6655/device_cfg.h b/drivers/staging/vt6655/device_cfg.h index 8a070c6..408edc2 100644 --- a/drivers/staging/vt6655/device_cfg.h +++ b/drivers/staging/vt6655/device_cfg.h @@ -39,10 +39,6 @@ struct _version { unsigned char build; } version_t, *pversion_t; -#ifndef FALSE -#define FALSE (0) -#endif - #define VID_TABLE_SIZE 64 #define MCAST_TABLE_SIZE 64 #define MCAM_SIZE 32 diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 41e3ed3..cb385b7 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -396,7 +396,7 @@ device_set_bool_opt(unsigned int *opt, int val,BOOL def,u32 flag, char* name,cha *opt|=(def ? flag : 0); } else { DBG_PRT(MSG_LEVEL_INFO, KERN_NOTICE "%s: set parameter %s to %s\n", - devname,name , val ? "1" : "FALSE"); + devname,name , val ? "1" : "0"); *opt|=(val ? flag : 0); } } @@ -507,7 +507,7 @@ static void s_vCompleteCurrentMeasure (PSDevice pDevice, unsigned char byResult) ); } else { VNTWIFIbMeasureReport( pDevice->pMgmt, - FALSE, + 0, pDevice->pCurrMeasureEID, byResult, pDevice->byBasicMap, @@ -543,10 +543,10 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) MACbSoftwareReset(pDevice->PortOffset); // force CCK pDevice->bCCK = 1; - pDevice->bAES = FALSE; - pDevice->bProtectMode = FALSE; //Only used in 11g type, sync with ERP IE - pDevice->bNonERPPresent = FALSE; - pDevice->bBarkerPreambleMd = FALSE; + pDevice->bAES = 0; + pDevice->bProtectMode = 0; //Only used in 11g type, sync with ERP IE + pDevice->bNonERPPresent = 0; + pDevice->bBarkerPreambleMd = 0; pDevice->wCurrentRate = RATE_1M; pDevice->byTopOFDMBasicRate = RATE_24M; pDevice->byTopCCKBasicRate = RATE_1M; @@ -574,7 +574,7 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) if (byValue & EEP_ANTINV) pDevice->bTxRxAntInv = 1; else - pDevice->bTxRxAntInv = FALSE; + pDevice->bTxRxAntInv = 0; #ifdef PLICE_DEBUG //printk("init_register:TxRxAntInv is %d,byValue is %d\n",pDevice->bTxRxAntInv,byValue); #endif @@ -605,14 +605,14 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) byValue1 = SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_ANTENNA); // if (pDevice->bDiversityRegCtlON) if((byValue1&0x08)==0) - pDevice->bDiversityEnable = FALSE;//SROMbyReadEmbedded(pDevice->PortOffset, 0x50); + pDevice->bDiversityEnable = 0;//SROMbyReadEmbedded(pDevice->PortOffset, 0x50); else pDevice->bDiversityEnable = 1; #ifdef PLICE_DEBUG //printk("aux |main antenna: RxAntennaMode is %d\n",pDevice->byRxAntennaMode); #endif } else { - pDevice->bDiversityEnable = FALSE; + pDevice->bDiversityEnable = 0; pDevice->byAntennaCount = 1; pDevice->dwTxAntennaSel = 0; pDevice->dwRxAntennaSel = 0; @@ -640,7 +640,7 @@ byValue1 = SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_ANTENNA); //2008-8-4 <add> by chester //zonetype initial pDevice->byOriginalZonetype = pDevice->abyEEPROM[EEP_OFS_ZONETYPE]; - zonetype = Config_FileOperation(pDevice,FALSE,NULL); + zonetype = Config_FileOperation(pDevice, 0, NULL); if (zonetype >= 0) { //read zonetype file ok! if ((zonetype == 0)&& (pDevice->abyEEPROM[EEP_OFS_ZONETYPE] !=0x00)){ //for USA @@ -682,7 +682,7 @@ else pDevice->byRFType &= RF_MASK; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->byRFType = %x\n", pDevice->byRFType); - if (pDevice->bZoneRegExist == FALSE) { + if (pDevice->bZoneRegExist == 0) { pDevice->byZoneType = pDevice->abyEEPROM[EEP_OFS_ZONETYPE]; } DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->byZoneType = %x\n", pDevice->byZoneType); @@ -782,10 +782,10 @@ else VNTWIFIbConfigPhyMode(pDevice->pMgmt, PHY_TYPE_11G); VNTWIFIbConfigPhyMode(pDevice->pMgmt, PHY_TYPE_AUTO); - pDevice->bRadioOff = FALSE; + pDevice->bRadioOff = 0; pDevice->byRadioCtl = SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_RADIOCTL); - pDevice->bHWRadioOff = FALSE; + pDevice->bHWRadioOff = 0; if (pDevice->byRadioCtl & EEP_RADIOCTL_ENABLE) { // Get GPIO @@ -793,7 +793,7 @@ else //2008-4-14 <add> by chester for led issue #ifdef FOR_LED_ON_NOTEBOOK if (pDevice->byGPIO & GPIO0_DATA){pDevice->bHWRadioOff = 1;} -if ( !(pDevice->byGPIO & GPIO0_DATA)){pDevice->bHWRadioOff = FALSE;} +if ( !(pDevice->byGPIO & GPIO0_DATA)){pDevice->bHWRadioOff = 0;} } if ( (pDevice->bRadioControlOff == 1)) { @@ -946,7 +946,7 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) if (bFirst) { printk(KERN_NOTICE "%s Ver. %s\n",DEVICE_FULL_DRV_NAM, DEVICE_VERSION); printk(KERN_NOTICE "Copyright (c) 2003 VIA Networking Technologies, Inc.\n"); - bFirst=FALSE; + bFirst = 0; } if (!vt6655_init_info(pcid, &pDevice, pChip_info)) { @@ -964,7 +964,7 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) #ifdef DEBUG printk("Before get pci_info memaddr is %x\n",pDevice->memaddr); #endif - if (device_get_pci_info(pDevice,pcid) == FALSE) { + if (device_get_pci_info(pDevice,pcid) == 0) { printk(KERN_ERR DEVICE_NAME ": Failed to find PCI device.\n"); device_free_info(pDevice); return -ENODEV; @@ -1280,7 +1280,7 @@ static BOOL device_init_rings(PSDevice pDevice) { if (vir_pool == NULL) { DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s : allocate desc dma memory failed\n", pDevice->dev->name); - return FALSE; + return 0; } memset(vir_pool, 0, @@ -1315,7 +1315,7 @@ static BOOL device_init_rings(PSDevice pDevice) { pDevice->sOpts.nTxDescs[1] * sizeof(STxDesc), vir_pool, pDevice->pool_dma ); - return FALSE; + return 0; } memset(pDevice->tx0_bufs, 0, @@ -1634,7 +1634,7 @@ static BOOL device_alloc_rx_buf(PSDevice pDevice, PSRxDesc pRD) { //printk("device_alloc_rx_buf:skb is %x\n",pRDInfo->skb); #endif if (pRDInfo->skb==NULL) - return FALSE; + return 0; ASSERT(pRDInfo->skb); pRDInfo->skb->dev = pDevice->dev; pRDInfo->skb_dma = pci_map_single(pDevice->pcid, skb_tail_pointer(pRDInfo->skb), @@ -1655,7 +1655,7 @@ BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF) { pDeF->skb = dev_alloc_skb((int)pDevice->rx_buf_sz); if (pDeF->skb == NULL) - return FALSE; + return 0; ASSERT(pDeF->skb); pDeF->skb->dev = pDevice->dev; @@ -1666,7 +1666,7 @@ BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF) { static int device_tx_srv(PSDevice pDevice, unsigned int uIdx) { PSTxDesc pTD; - BOOL bFull=FALSE; + BOOL bFull = 0; int works = 0; unsigned char byTsr0; unsigned char byTsr1; @@ -1786,7 +1786,7 @@ static int device_tx_srv(PSDevice pDevice, unsigned int uIdx) { bFull = 1; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " AC0DMA is Full = %d\n", pDevice->iTDUsed[uIdx]); } - if (netif_queue_stopped(pDevice->dev) && (bFull==FALSE)){ + if (netif_queue_stopped(pDevice->dev) && (bFull == 0)){ netif_wake_queue(pDevice->dev); } } @@ -1807,7 +1807,7 @@ static void device_error(PSDevice pDevice, unsigned short status) { netif_stop_queue(pDevice->dev); del_timer(&pDevice->sTimerCommand); del_timer(&(pDevice->pMgmt->sTimerSecondCallback)); - pDevice->bCmdRunning = FALSE; + pDevice->bCmdRunning = 0; MACbShutdown(pDevice->PortOffset); return; } @@ -1917,8 +1917,8 @@ static int device_open(struct net_device *dev) { wpa_Result.proto = 0; wpa_Result.key_mgmt = 0; wpa_Result.eap_type = 0; - wpa_Result.authenticated = FALSE; - pDevice->fWPA_Authened = FALSE; + wpa_Result.authenticated = 0; + pDevice->fWPA_Authened = 0; #endif DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call device init rd0 ring\n"); device_init_rd0_ring(pDevice); @@ -1983,16 +1983,16 @@ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call device_init_registers\n"); #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT /* - pDevice->bwextstep0 = FALSE; - pDevice->bwextstep1 = FALSE; - pDevice->bwextstep2 = FALSE; - pDevice->bwextstep3 = FALSE; + pDevice->bwextstep0 = 0; + pDevice->bwextstep1 = 0; + pDevice->bwextstep2 = 0; + pDevice->bwextstep3 = 0; */ pDevice->bwextcount=0; - pDevice->bWPASuppWextEnabled = FALSE; + pDevice->bWPASuppWextEnabled = 0; #endif pDevice->byReAssocCount = 0; - pDevice->bWPADEVUp = FALSE; + pDevice->bWPADEVUp = 0; // Patch: if WEP key already set by iwconfig but device not yet open if ((pDevice->bEncryptionEnable == 1) && (pDevice->bTransmitKey == 1)) { KeybSetDefaultKey(&(pDevice->sKey), @@ -2055,12 +2055,12 @@ static int device_close(struct net_device *dev) { tasklet_kill(&pDevice->RxMngWorkItem); #endif netif_stop_queue(dev); - pDevice->bCmdRunning = FALSE; + pDevice->bCmdRunning = 0; MACbShutdown(pDevice->PortOffset); MACbSoftwareReset(pDevice->PortOffset); CARDbRadioPowerOff(pDevice); - pDevice->bLinkPass = FALSE; + pDevice->bLinkPass = 0; memset(pMgmt->abyCurrBSSID, 0, 6); pMgmt->eCurrState = WMAC_STATE_IDLE; device_free_td0_ring(pDevice); @@ -2124,7 +2124,7 @@ BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeI unsigned int cbFrameBodySize; unsigned int uMACfragNum; unsigned char byPktType; - BOOL bNeedEncryption = FALSE; + BOOL bNeedEncryption = 0; PSKeyItem pTransmitKey = NULL; unsigned int cbHeaderSize; unsigned int ii; @@ -2134,20 +2134,20 @@ BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeI if (pDevice->bStopTx0Pkt == 1) { dev_kfree_skb_irq(skb); - return FALSE; + return 0; }; if (AVAIL_TD(pDevice, TYPE_TXDMA0) <= 0) { dev_kfree_skb_irq(skb); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_dma0_xmit, td0 <=0\n"); - return FALSE; + return 0; } if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) { if (pDevice->uAssocCount == 0) { dev_kfree_skb_irq(skb); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_dma0_xmit, assocCount = 0\n"); - return FALSE; + return 0; } } @@ -2166,7 +2166,7 @@ BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeI if ( uMACfragNum > AVAIL_TD(pDevice, TYPE_TXDMA0)) { dev_kfree_skb_irq(skb); - return FALSE; + return 0; } byPktType = (unsigned char)pDevice->byPacketType; @@ -2239,7 +2239,7 @@ BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeI MACbPSWakeup(pDevice->PortOffset); } - pDevice->bPWBitOn = FALSE; + pDevice->bPWBitOn = 0; pLastTD = pHeadTD; for (ii = 0; ii < uMACfragNum; ii++) { @@ -2279,19 +2279,19 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) { unsigned int cbFrameBodySize; unsigned char byPktType; unsigned int cbHeaderSize; - BOOL bNeedEncryption = FALSE; + BOOL bNeedEncryption = 0; PSKeyItem pTransmitKey = NULL; SKeyItem STempKey; unsigned int ii; - BOOL bTKIP_UseGTK = FALSE; - BOOL bNeedDeAuth = FALSE; + BOOL bTKIP_UseGTK = 0; + BOOL bNeedDeAuth = 0; unsigned char *pbyBSSID; - BOOL bNodeExist = FALSE; + BOOL bNodeExist = 0; spin_lock_irq(&pDevice->lock); - if (pDevice->bLinkPass == FALSE) { + if (pDevice->bLinkPass == 0) { dev_kfree_skb_irq(skb); spin_unlock_irq(&pDevice->lock); return 0; @@ -2346,7 +2346,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) { } } - if (bNodeExist == FALSE) { + if (bNodeExist == 0) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"Unknown STA not found in node DB \n"); dev_kfree_skb_irq(skb); spin_unlock_irq(&pDevice->lock); @@ -2375,7 +2375,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) { (pDevice->pMgmt->eCurrState == WMAC_STATE_ASSOC)) { pbyBSSID = pDevice->abyBSSID; // get pairwise key - if (KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, PAIRWISE_KEY, &pTransmitKey) == FALSE) { + if (KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, PAIRWISE_KEY, &pTransmitKey) == 0) { // get group key if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == 1) { bTKIP_UseGTK = 1; @@ -2400,7 +2400,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) { } // get group key pbyBSSID = pDevice->abyBroadcastAddr; - if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == FALSE) { + if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == 0) { pTransmitKey = NULL; if (pDevice->pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"IBSS and KEY is NULL. [%d]\n", pDevice->pMgmt->eCurrMode); @@ -2411,7 +2411,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) { bTKIP_UseGTK = 1; DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"Get GTK.\n"); } - } while(FALSE); + } while(0); } if (pDevice->bEnableHostWEP) { @@ -2538,7 +2538,7 @@ pDevice->byTopCCKBasicRate,pDevice->byTopOFDMBasicRate); if (bNeedEncryption == 1) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ntohs Pkt Type=%04x\n", ntohs(pDevice->sTxEthHeader.wType)); if ((pDevice->sTxEthHeader.wType) == TYPE_PKT_802_1x) { - bNeedEncryption = FALSE; + bNeedEncryption = 0; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Pkt Type=%04x\n", (pDevice->sTxEthHeader.wType)); if ((pDevice->pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pDevice->pMgmt->eCurrState == WMAC_STATE_ASSOC)) { if (pTransmitKey == NULL) { @@ -2596,7 +2596,7 @@ pDevice->byTopCCKBasicRate,pDevice->byTopOFDMBasicRate); // Disable PS MACbPSWakeup(pDevice->PortOffset); } - pDevice->bPWBitOn = FALSE; + pDevice->bPWBitOn = 0; pLastTD = pHeadTD; for (ii = 0; ii < uMACfragNum; ii++) { @@ -2638,7 +2638,7 @@ pDevice->byTopCCKBasicRate,pDevice->byTopOFDMBasicRate); unsigned char Packet_Type; //802.1x Authentication unsigned char Descriptor_type; unsigned short Key_info; -BOOL bTxeapol_key = FALSE; +BOOL bTxeapol_key = 0; Protocol_Version = skb->data[ETH_HLEN]; Packet_Type = skb->data[ETH_HLEN+1]; Descriptor_type = skb->data[ETH_HLEN+1+1+2]; @@ -2773,7 +2773,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) { } if (pDevice->dwIsr & ISR_MEASUREEND) { // 802.11h measure end - pDevice->bMeasureInProgress = FALSE; + pDevice->bMeasureInProgress = 0; VNSvOutPortB(pDevice->PortOffset + MAC_REG_RCR, pDevice->byOrgRCR); MACvSelectPage1(pDevice->PortOffset); VNSvOutPortD(pDevice->PortOffset + MAC_REG_MAR0, pDevice->dwOrgMAR0); @@ -2801,7 +2801,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) { if (pDevice->dwIsr & ISR_QUIETSTART) { do { ; - } while (CARDbStartQuiet(pDevice) == FALSE); + } while (CARDbStartQuiet(pDevice) == 0); } } @@ -2809,7 +2809,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) { if (pDevice->bEnableFirstQuiet == 1) { pDevice->byQuietStartCount--; if (pDevice->byQuietStartCount == 0) { - pDevice->bEnableFirstQuiet = FALSE; + pDevice->bEnableFirstQuiet = 0; MACvSelectPage1(pDevice->PortOffset); MACvRegBitsOn(pDevice->PortOffset, MAC_REG_MSRCTL, (MSRCTL_QUIETTXCHK | MSRCTL_QUIETEN)); MACvSelectPage0(pDevice->PortOffset); @@ -2819,7 +2819,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) { (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE)) { pDevice->byChannelSwitchCount--; if (pDevice->byChannelSwitchCount == 0) { - pDevice->bChannelSwitch = FALSE; + pDevice->bChannelSwitch = 0; set_channel(pDevice, pDevice->byNewChannel); VNTWIFIbChannelSwitch(pDevice->pMgmt, pDevice->byNewChannel); MACvSelectPage1(pDevice->PortOffset); @@ -2830,7 +2830,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) { } } if (pDevice->eOPMode == OP_MODE_ADHOC) { - //pDevice->bBeaconSent = FALSE; + //pDevice->bBeaconSent = 0; } else { if ((pDevice->bUpdateBBVGA) && (pDevice->bLinkPass == 1) && (pDevice->uCurrRSSI != 0)) { long ldBm; @@ -2861,7 +2861,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) { } } - pDevice->bBeaconSent = FALSE; + pDevice->bBeaconSent = 0; if (pDevice->bEnablePSMode) { PSbIsNextTBTTWakeUp((void *)pDevice); }; @@ -2882,14 +2882,14 @@ static irqreturn_t device_intr(int irq, void *dev_instance) { if (pDevice->dwIsr & ISR_BNTX) { if (pDevice->eOPMode == OP_MODE_ADHOC) { - pDevice->bIsBeaconBufReadySet = FALSE; + pDevice->bIsBeaconBufReadySet = 0; pDevice->cbBeaconBufReadySetCnt = 0; }; if (pDevice->eOPMode == OP_MODE_AP) { if(pMgmt->byDTIMCount > 0) { pMgmt->byDTIMCount --; - pMgmt->sNodeDBTable[0].bRxPSPoll = FALSE; + pMgmt->sNodeDBTable[0].bRxPSPoll = 0; } else { if(pMgmt->byDTIMCount == 0) { @@ -2905,7 +2905,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) { if (pDevice->bChannelSwitch == 1) { pDevice->byChannelSwitchCount--; if (pDevice->byChannelSwitchCount == 0) { - pDevice->bChannelSwitch = FALSE; + pDevice->bChannelSwitch = 0; set_channel(pDevice, pDevice->byNewChannel); VNTWIFIbChannelSwitch(pDevice->pMgmt, pDevice->byNewChannel); MACvSelectPage1(pDevice->PortOffset); @@ -3559,7 +3559,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { else { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Commit the settings\n"); spin_lock_irq(&pDevice->lock); - pDevice->bLinkPass = FALSE; + pDevice->bLinkPass = 0; memset(pMgmt->abyCurrBSSID, 0, 6); pMgmt->eCurrState = WMAC_STATE_IDLE; netif_stop_queue(pDevice->dev); @@ -3571,7 +3571,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { bScheduleCommand((void *) pDevice, WLAN_CMD_SSID, NULL); spin_unlock_irq(&pDevice->lock); } - pDevice->bCommit = FALSE; + pDevice->bCommit = 0; } return rc; @@ -3681,10 +3681,10 @@ viawget_suspend(struct pci_dev *pcid, pm_message_t state) pDevice->cbFreeCmdQueue = CMD_Q_SIZE; pDevice->uCmdDequeueIdx = 0; pDevice->uCmdEnqueueIdx = 0; - pDevice->bCmdRunning = FALSE; + pDevice->bCmdRunning = 0; MACbShutdown(pDevice->PortOffset); MACvSaveContext(pDevice->PortOffset, pDevice->abyMacContext); - pDevice->bLinkPass = FALSE; + pDevice->bLinkPass = 0; memset(pMgmt->abyCurrBSSID, 0, 6); pMgmt->eCurrState = WMAC_STATE_IDLE; pci_disable_device(pcid); @@ -3709,8 +3709,8 @@ viawget_resume(struct pci_dev *pcid) MACvRestoreContext(pDevice->PortOffset, pDevice->abyMacContext); device_init_registers(pDevice, DEVICE_INIT_DXPL); if (pMgmt->sNodeDBTable[0].bActive == 1) { // Assoc with BSS - pMgmt->sNodeDBTable[0].bActive = FALSE; - pDevice->bLinkPass = FALSE; + pMgmt->sNodeDBTable[0].bActive = 0; + pDevice->bLinkPass = 0; if(pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) { // In Adhoc, BSS state set back to started. pMgmt->eCurrState = WMAC_STATE_STARTED; diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c index 87217dd..f3ee489 100644 --- a/drivers/staging/vt6655/dpc.c +++ b/drivers/staging/vt6655/dpc.c @@ -335,8 +335,8 @@ device_receive_frame ( PQWORD pqwTSFTime; unsigned short *pwFrameSize; unsigned char *pbyFrame; - BOOL bDeFragRx = FALSE; - BOOL bIsWEP = FALSE; + BOOL bDeFragRx = 0; + BOOL bIsWEP = 0; unsigned int cbHeaderOffset; unsigned int FrameSize; unsigned short wEtherType = 0; @@ -344,7 +344,7 @@ device_receive_frame ( int iDANodeIndex = -1; unsigned int ii; unsigned int cbIVOffset; - BOOL bExtIV = FALSE; + BOOL bExtIV = 0; unsigned char *pbyRxSts; unsigned char *pbyRxRate; unsigned char *pbySQ; @@ -358,7 +358,7 @@ device_receive_frame ( long ldBm = 0; long ldBmThreshold = 0; PS802_11Header pMACHeader; - BOOL bRxeapol_key = FALSE; + BOOL bRxeapol_key = 0; // DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---------- device_receive_frame---\n"); @@ -379,7 +379,7 @@ device_receive_frame ( if ((FrameSize > 2364)||(FrameSize <= 32)) { // Frame Size error drop this packet. DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---------- WRONG Length 1 \n"); - return FALSE; + return 0; } pbyRxSts = (unsigned char *) (skb->data); @@ -397,7 +397,7 @@ device_receive_frame ( if ((FrameSize > 2346)|(FrameSize < 14)) { // Max: 2312Payload + 30HD +4CRC // Min: 14 bytes ACK DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---------- WRONG Length 2 \n"); - return FALSE; + return 0; } //PLICE_DEBUG-> #if 1 @@ -440,13 +440,13 @@ device_receive_frame ( ii--; } pDevice->dwRPIs[ii] += dwDuration; - return FALSE; + return 0; } if (!is_multicast_ether_addr(pbyFrame)) { if (WCTLbIsDuplicate(&(pDevice->sDupRxCache), (PS802_11Header) (skb->data + 4))) { pDevice->s802_11Counter.FrameDuplicateCount++; - return FALSE; + return 0; } } @@ -456,7 +456,7 @@ device_receive_frame ( // filter packet send from myself if (!compare_ether_addr((unsigned char *)&(pDevice->sRxEthHeader.abySrcAddr[0]), pDevice->abyCurrentNetAddr)) - return FALSE; + return 0; if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) || (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA)) { if (IS_CTL_PSPOLL(pbyFrame) || !IS_TYPE_CONTROL(pbyFrame)) { @@ -471,13 +471,13 @@ device_receive_frame ( if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) { if (s_bAPModeRxCtl(pDevice, pbyFrame, iSANodeIndex) == 1) { - return FALSE; + return 0; } } if (IS_FC_WEP(pbyFrame)) { - BOOL bRxDecryOK = FALSE; + BOOL bRxDecryOK = 0; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"rx WEP pkt\n"); bIsWEP = 1; @@ -532,11 +532,11 @@ device_receive_frame ( // pDevice->s802_11Counter.WEPICVErrorCount.QuadPart++; } } - return FALSE; + return 0; } } else { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"WEP Func Fail\n"); - return FALSE; + return 0; } if ((pKey != NULL) && (pKey->byCipherSuite == KEY_CTL_CCMP)) FrameSize -= 8; // Message Integrity Code @@ -564,13 +564,13 @@ device_receive_frame ( } else { - return FALSE; + return 0; } } // Management & Control frame Handle - if ((IS_TYPE_DATA((skb->data+4))) == FALSE) { + if ((IS_TYPE_DATA((skb->data+4))) == 0) { // Handle Control & Manage Frame if (IS_TYPE_MGMT((skb->data+4))) { @@ -635,7 +635,7 @@ device_receive_frame ( else { // Control Frame }; - return FALSE; + return 0; } else { if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) { @@ -647,12 +647,12 @@ device_receive_frame ( pDevice->dev->name); } } - return FALSE; + return 0; } } else { // discard DATA packet while not associate || BSSID error - if ((pDevice->bLinkPass == FALSE) || + if ((pDevice->bLinkPass == 0) || !(*pbyRsr & RSR_BSSIDOK)) { if (bDeFragRx) { if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { @@ -660,7 +660,7 @@ device_receive_frame ( pDevice->dev->name); } } - return FALSE; + return 0; } //mike add:station mode check eapol-key challenge---> { @@ -697,7 +697,7 @@ device_receive_frame ( } else { if (pDevice->pMgmt->bInTIMWake == 1) { - pDevice->pMgmt->bInTIMWake = FALSE; + pDevice->pMgmt->bInTIMWake = 0; } } }; @@ -766,7 +766,7 @@ device_receive_frame ( } // check if 802.1x authorized if (!(pMgmt->sNodeDBTable[iSANodeIndex].dwFlags & WLAN_STA_AUTHORIZED)) - return FALSE; + return 0; } @@ -826,7 +826,7 @@ device_receive_frame ( if ((cpu_to_le32(*pdwMIC_L) != dwLocalMIC_L) || (cpu_to_le32(*pdwMIC_R) != dwLocalMIC_R) || (pDevice->bRxMICFail == 1)) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC comparison is fail!\n"); - pDevice->bRxMICFail = FALSE; + pDevice->bRxMICFail = 0; //pDevice->s802_11Counter.TKIPLocalMICFailures.QuadPart++; pDevice->s802_11Counter.TKIPLocalMICFailures++; if (bDeFragRx) { @@ -886,7 +886,7 @@ device_receive_frame ( pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz); }; - return FALSE; + return 0; } } @@ -930,7 +930,7 @@ device_receive_frame ( pDevice->dev->name); } } - return FALSE; + return 0; } } } @@ -949,7 +949,7 @@ device_receive_frame ( // Null data, framesize = 14 if (FrameSize < 15) - return FALSE; + return 0; if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) { if (s_bAPModeRxData(pDevice, @@ -958,7 +958,7 @@ device_receive_frame ( cbHeaderOffset, iSANodeIndex, iDANodeIndex - ) == FALSE) { + ) == 0) { if (bDeFragRx) { if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { @@ -966,10 +966,10 @@ device_receive_frame ( pDevice->dev->name); } } - return FALSE; + return 0; } -// if(pDevice->bRxMICFail == FALSE) { +// if(pDevice->bRxMICFail == 0) { // for (ii =0; ii < 100; ii++) // printk(" %02x", *(skb->data + ii)); // printk("\n"); @@ -996,7 +996,7 @@ device_receive_frame ( pDevice->dev->name); } } - return FALSE; + return 0; } } */ @@ -1011,7 +1011,7 @@ device_receive_frame ( DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n", pDevice->dev->name); } - return FALSE; + return 0; } return 1; @@ -1074,7 +1074,7 @@ static BOOL s_bAPModeRxCtl ( // check Data PS state // if PW bit off, send out all PS bufferring packets. if (!IS_FC_POWERMGT(pbyFrame)) { - pMgmt->sNodeDBTable[iSANodeIndex].bPSEnable = FALSE; + pMgmt->sNodeDBTable[iSANodeIndex].bPSEnable = 0; pMgmt->sNodeDBTable[iSANodeIndex].bRxPSPoll = 1; bScheduleCommand((void *)pDevice, WLAN_CMD_RX_PSPOLL, NULL); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: WLAN_CMD_RX_PSPOLL 2\n"); @@ -1090,7 +1090,7 @@ static BOOL s_bAPModeRxCtl ( else { // clear all pending PS frame. if (pMgmt->sNodeDBTable[iSANodeIndex].wEnQueueCnt > 0) { - pMgmt->sNodeDBTable[iSANodeIndex].bPSEnable = FALSE; + pMgmt->sNodeDBTable[iSANodeIndex].bPSEnable = 0; pMgmt->sNodeDBTable[iSANodeIndex].bRxPSPoll = 1; bScheduleCommand((void *)pDevice, WLAN_CMD_RX_PSPOLL, NULL); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: WLAN_CMD_RX_PSPOLL 3\n"); @@ -1138,7 +1138,7 @@ static BOOL s_bAPModeRxCtl ( } } } - return FALSE; + return 0; } @@ -1221,7 +1221,7 @@ static BOOL s_bHandleRxEncryption ( } else if (pDevice->bLinkPass == 1) { // pDevice->s802_11Counter.DecryptFailureCount.QuadPart++; } - return FALSE; + return 0; } if (byDecMode != pKey->byCipherSuite) { if (byDecMode == KEY_CTL_WEP) { @@ -1230,7 +1230,7 @@ static BOOL s_bHandleRxEncryption ( // pDevice->s802_11Counter.DecryptFailureCount.QuadPart++; } *pKeyOut = NULL; - return FALSE; + return 0; } if (byDecMode == KEY_CTL_WEP) { // handle WEP @@ -1336,7 +1336,7 @@ static BOOL s_bHostWepRxEncryption ( } else if (pDevice->bLinkPass == 1) { // pDevice->s802_11Counter.DecryptFailureCount.QuadPart++; } - return FALSE; + return 0; } if (byDecMode == KEY_CTL_WEP) { @@ -1344,7 +1344,7 @@ static BOOL s_bHostWepRxEncryption ( DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"byDecMode == KEY_CTL_WEP \n"); if ((pDevice->byLocalID <= REV_ID_VT3253_A1) || (((PSKeyTable)(pKey->pvKeyTable))->bSoftWEP == 1) || - (bOnFly == FALSE)) { + (bOnFly == 0)) { // Software WEP // 1. 3253A // 2. WEP 256 @@ -1377,7 +1377,7 @@ static BOOL s_bHostWepRxEncryption ( if (byDecMode == KEY_CTL_TKIP) { - if ((pDevice->byLocalID <= REV_ID_VT3253_A1) || (bOnFly == FALSE)) { + if ((pDevice->byLocalID <= REV_ID_VT3253_A1) || (bOnFly == 0)) { // Software TKIP // 1. 3253 A // 2. NotOnFly @@ -1397,7 +1397,7 @@ static BOOL s_bHostWepRxEncryption ( } if (byDecMode == KEY_CTL_CCMP) { - if (bOnFly == FALSE) { + if (bOnFly == 0) { // Software CCMP // NotOnFly DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"soft KEY_CTL_CCMP\n"); @@ -1429,8 +1429,8 @@ static BOOL s_bAPModeRxData ( ) { PSMgmtObject pMgmt = pDevice->pMgmt; - BOOL bRelayAndForward = FALSE; - BOOL bRelayOnly = FALSE; + BOOL bRelayAndForward = 0; + BOOL bRelayOnly = 0; unsigned char byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; unsigned short wAID; @@ -1438,7 +1438,7 @@ static BOOL s_bAPModeRxData ( struct sk_buff* skbcpy = NULL; if (FrameSize > CB_MAX_BUF_SIZE) - return FALSE; + return 0; // check DA if(is_multicast_ether_addr((unsigned char *)(skb->data+cbHeaderOffset))) { if (pMgmt->sNodeDBTable[0].bPSEnable) { @@ -1499,11 +1499,11 @@ static BOOL s_bAPModeRxData ( } if (bRelayOnly) - return FALSE; + return 0; } // none associate, don't forward if (pDevice->uAssocCount == 0) - return FALSE; + return 0; return 1; } diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c index e69e31e..bcb05bd 100644 --- a/drivers/staging/vt6655/hostap.c +++ b/drivers/staging/vt6655/hostap.c @@ -154,9 +154,9 @@ static int hostap_disable_hostapd(PSDevice pDevice, int rtnl_locked) } kfree(pDevice->apdev); pDevice->apdev = NULL; - pDevice->bEnable8021x = FALSE; - pDevice->bEnableHostWEP = FALSE; - pDevice->bEncryptionEnable = FALSE; + pDevice->bEnable8021x = 0; + pDevice->bEnableHostWEP = 0; + pDevice->bEncryptionEnable = 0; //4.2007-0118-03,<Add> by EinsnLiu //execute some clear work @@ -255,7 +255,7 @@ static int hostap_add_sta(PSDevice pDevice, pMgmt->sNodeDBTable[uNodeIndex].wCapInfo = param->u.add_sta.capability; // TODO listenInterval // pMgmt->sNodeDBTable[uNodeIndex].wListenInterval = 1; - pMgmt->sNodeDBTable[uNodeIndex].bPSEnable = FALSE; + pMgmt->sNodeDBTable[uNodeIndex].bPSEnable = 0; pMgmt->sNodeDBTable[uNodeIndex].bySuppRate = param->u.add_sta.tx_supp_rates; // set max tx rate @@ -328,7 +328,7 @@ static int hostap_get_info_sta(PSDevice pDevice, * pDevice - * param - * Out: - * TURE, FALSE + * 1, 0 * * Return Value: * @@ -479,7 +479,7 @@ static int hostap_set_encryption(PSDevice pDevice, int ret = 0; int iNodeIndex = -1; int ii; - BOOL bKeyTableFull = FALSE; + BOOL bKeyTableFull = 0; unsigned short wKeyCtl = 0; @@ -509,7 +509,7 @@ static int hostap_set_encryption(PSDevice pDevice, iNodeIndex = 0; } else { - if (BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &iNodeIndex) == FALSE) { + if (BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &iNodeIndex) == 0) { param->u.crypt.err = HOSTAP_CRYPT_ERR_UNKNOWN_ADDR; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " HOSTAP_CRYPT_ERR_UNKNOWN_ADDR\n"); return -EINVAL; @@ -524,10 +524,10 @@ static int hostap_set_encryption(PSDevice pDevice, if (KeybRemoveKey(&(pDevice->sKey), param->sta_addr, pMgmt->sNodeDBTable[iNodeIndex].dwKeyIndex, - pDevice->PortOffset) == FALSE) { + pDevice->PortOffset) == 0) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "KeybRemoveKey fail \n"); } - pMgmt->sNodeDBTable[iNodeIndex].bOnFly = FALSE; + pMgmt->sNodeDBTable[iNodeIndex].bOnFly = 0; } pMgmt->sNodeDBTable[iNodeIndex].byKeyIndex = 0; pMgmt->sNodeDBTable[iNodeIndex].dwKeyIndex = 0; @@ -562,7 +562,7 @@ static int hostap_set_encryption(PSDevice pDevice, if (param->u.crypt.alg == WPA_ALG_WEP) { - if ((pDevice->bEnable8021x == FALSE) || (iNodeIndex == 0)) { + if ((pDevice->bEnable8021x == 0) || (iNodeIndex == 0)) { KeybSetDefaultKey(&(pDevice->sKey), dwKeyIndex & ~(BIT30 | USE_KEYRSC), param->u.crypt.key_len, @@ -589,7 +589,7 @@ static int hostap_set_encryption(PSDevice pDevice, } else { // Key Table Full - pMgmt->sNodeDBTable[iNodeIndex].bOnFly = FALSE; + pMgmt->sNodeDBTable[iNodeIndex].bOnFly = 0; bKeyTableFull = 1; } } @@ -658,7 +658,7 @@ static int hostap_set_encryption(PSDevice pDevice, } else { // Key Table Full - pMgmt->sNodeDBTable[iNodeIndex].bOnFly = FALSE; + pMgmt->sNodeDBTable[iNodeIndex].bOnFly = 0; bKeyTableFull = 1; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " Key Table Full\n"); } @@ -727,7 +727,7 @@ static int hostap_get_encryption(PSDevice pDevice, param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) { iNodeIndex = 0; } else { - if (BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &iNodeIndex) == FALSE) { + if (BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &iNodeIndex) == 0) { param->u.crypt.err = HOSTAP_CRYPT_ERR_UNKNOWN_ADDR; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "hostap_get_encryption: HOSTAP_CRYPT_ERR_UNKNOWN_ADDR\n"); return -EINVAL; diff --git a/drivers/staging/vt6655/ioctl.c b/drivers/staging/vt6655/ioctl.c index 764f6bb..92ad4f4 100644 --- a/drivers/staging/vt6655/ioctl.c +++ b/drivers/staging/vt6655/ioctl.c @@ -105,11 +105,11 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { vMgrTimerInit(pDevice); MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE); add_timer(&pMgmt->sTimerSecondCallback); - pDevice->bMACSuspend = FALSE; + pDevice->bMACSuspend = 0; } spin_lock_irq(&pDevice->lock); if (memcmp(pMgmt->abyCurrBSSID, &abyNullAddr[0], 6) == 0) - BSSvClearBSSList((void *)pDevice, FALSE); + BSSvClearBSSList((void *)pDevice, 0); else BSSvClearBSSList((void *)pDevice, pDevice->bLinkPass); @@ -180,7 +180,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { vMgrTimerInit(pDevice); MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE); add_timer(&pMgmt->sTimerSecondCallback); - pDevice->bMACSuspend = FALSE; + pDevice->bMACSuspend = 0; } if (copy_from_user(&sJoinCmd, pReq->data, sizeof(SCmdBSSJoin))) { @@ -216,7 +216,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Share Key \n"); } else { - pMgmt->bShareKeyAlgorithm = FALSE; + pMgmt->bShareKeyAlgorithm = 0; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Open System \n"); } pDevice->uChannel = sJoinCmd.uChannel; @@ -236,7 +236,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { break; }; if (sWEPCmd.bEnableWep != 1) { - pDevice->bEncryptionEnable = FALSE; + pDevice->bEncryptionEnable = 0; pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled; MACvDisableDefaultKey(pDevice->PortOffset); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WEP function disable. \n"); @@ -295,7 +295,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Link Success ! \n"); } else { - sLinkStatus.bLink = FALSE; + sLinkStatus.bLink = 0; } if (copy_to_user(pReq->data, &sLinkStatus, sizeof(SCmdLinkStatus))) { result = -EFAULT; @@ -356,7 +356,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { pList->sBSSIDList[ii].bWEPOn = 1; } else { - pList->sBSSIDList[ii].bWEPOn = FALSE; + pList->sBSSIDList[ii].bWEPOn = 0; } ii ++; if (ii >= pList->uItem) @@ -391,15 +391,15 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { netif_stop_queue(pDevice->dev); spin_lock_irq(&pDevice->lock); - if (pDevice->bRadioOff == FALSE) { + if (pDevice->bRadioOff == 0) { CARDbRadioPowerOff(pDevice); } - pDevice->bLinkPass = FALSE; + pDevice->bLinkPass = 0; memset(pMgmt->abyCurrBSSID, 0, 6); pMgmt->eCurrState = WMAC_STATE_IDLE; del_timer(&pDevice->sTimerCommand); del_timer(&pMgmt->sTimerSecondCallback); - pDevice->bCmdRunning = FALSE; + pDevice->bCmdRunning = 0; pDevice->bMACSuspend = 1; MACvIntDisable(pDevice->PortOffset); spin_unlock_irq(&pDevice->lock); @@ -416,7 +416,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { vMgrTimerInit(pDevice); MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE); add_timer(&pMgmt->sTimerSecondCallback); - pDevice->bMACSuspend = FALSE; + pDevice->bMACSuspend = 0; } break; @@ -462,7 +462,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable 802.1x\n"); } else { - pDevice->bEnable8021x = FALSE; + pDevice->bEnable8021x = 0; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable 802.1x\n"); } @@ -482,7 +482,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable HostWEP\n"); } else { - pDevice->bEnableHostWEP = FALSE; + pDevice->bEnableHostWEP = 0; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable HostWEP\n"); } @@ -502,7 +502,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { } else { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "close wpadev\n"); - pDevice->bWPADEVUp = FALSE; + pDevice->bWPADEVUp = 0; } break; @@ -559,7 +559,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Share Key \n"); } else { - pMgmt->bShareKeyAlgorithm = FALSE; + pMgmt->bShareKeyAlgorithm = 0; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Open System \n"); } memcpy(pMgmt->abyIBSSSuppRates, abySuppRates, 6); @@ -672,8 +672,8 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { wpa_Result.proto = 0; wpa_Result.key_mgmt = 0; wpa_Result.eap_type = 0; - wpa_Result.authenticated = FALSE; - pDevice->fWPA_Authened = FALSE; + wpa_Result.authenticated = 0; + pDevice->fWPA_Authened = 0; if (copy_from_user(&wpa_Result, pReq->data, sizeof(wpa_Result))) { result = -EFAULT; break; @@ -700,7 +700,7 @@ if(wpa_Result.authenticated == 1) { //printk("wpa-->proto=%d\n",wpa_Result.proto); //printk("wpa-->key-mgmt=%d\n",wpa_Result.key_mgmt); //printk("wpa-->eap_type=%d\n",wpa_Result.eap_type); - //printk("wpa-->authenticated is %s\n",(wpa_Result.authenticated == 1)? "1" :"FALSE"); + //printk("wpa-->authenticated is %s\n",(wpa_Result.authenticated == 1)? "1" :"0"); pReq->wResult = 0; break; diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwctl.c index 0fe0408..fb1c276 100644 --- a/drivers/staging/vt6655/iwctl.c +++ b/drivers/staging/vt6655/iwctl.c @@ -751,7 +751,7 @@ int iwctl_giwap(struct net_device *dev, memcpy(wrq->sa_data, pMgmt->abyCurrBSSID, 6); //2008-0410,<Modify> by Einsn Liu - if ((pDevice->bLinkPass == FALSE) && (pMgmt->eCurrMode != WMAC_MODE_ESS_AP)) + if ((pDevice->bLinkPass == 0) && (pMgmt->eCurrMode != WMAC_MODE_ESS_AP)) memset(wrq->sa_data, 0, 6); if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) { @@ -833,8 +833,8 @@ int iwctl_siwessid(struct net_device *dev, unsigned char len; - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWESSID \n"); - pDevice->fWPA_Authened = FALSE; + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWESSID \n"); + pDevice->fWPA_Authened = 0; if (pMgmt->eScanState == WMAC_IS_SCANNING) { // In scanning.. printk("SIOCSIWESSID(??)-->In scanning...\n"); @@ -1044,7 +1044,7 @@ int iwctl_siwrate(struct net_device *dev, } else { - pDevice->bFixRate = FALSE; + pDevice->bFixRate = 0; pDevice->uConnectionRate = 13; printk("auto rate:connection_rate is 13\n"); } @@ -1377,7 +1377,7 @@ if((wrq->flags & IW_ENCODE_DISABLED)==0){ }else if(index>0){ //when the length is 0 the request only changes the default transmit key index //check the new key has a non zero lenget - if(pDevice->bEncryptionEnable==FALSE) + if(pDevice->bEncryptionEnable == 0) { rc = -EINVAL; return rc; @@ -1396,10 +1396,10 @@ if((wrq->flags & IW_ENCODE_DISABLED)==0){ }else {//disable the key DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable WEP function\n"); - if(pDevice->bEncryptionEnable==FALSE) + if(pDevice->bEncryptionEnable == 0) return 0; - pMgmt->bShareKeyAlgorithm = FALSE; - pDevice->bEncryptionEnable = FALSE; + pMgmt->bShareKeyAlgorithm = 0; + pDevice->bEncryptionEnable = 0; pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled; if (pDevice->flags & DEVICE_FLAGS_OPENED) { spin_lock_irq(&pDevice->lock); @@ -1479,8 +1479,8 @@ if((wrq->flags & IW_ENCODE_DISABLED)==0){ if(wrq->flags & IW_ENCODE_DISABLED){ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable WEP function\n"); - pMgmt->bShareKeyAlgorithm = FALSE; - pDevice->bEncryptionEnable = FALSE; + pMgmt->bShareKeyAlgorithm = 0; + pDevice->bEncryptionEnable = 0; pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled; if (pDevice->flags & DEVICE_FLAGS_OPENED) { spin_lock_irq(&pDevice->lock); @@ -1497,7 +1497,7 @@ if((wrq->flags & IW_ENCODE_DISABLED)==0){ } if(wrq->flags & IW_ENCODE_OPEN) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable WEP & Open System\n"); - pMgmt->bShareKeyAlgorithm = FALSE; + pMgmt->bShareKeyAlgorithm = 0; } return rc; } @@ -1763,7 +1763,7 @@ int iwctl_siwauth(struct net_device *dev, wpa_version = wrq->value; if(wrq->value == IW_AUTH_WPA_VERSION_DISABLED) { PRINT_K("iwctl_siwauth:set WPADEV to disable at 1??????\n"); - //pDevice->bWPADevEnable = FALSE; + //pDevice->bWPADevEnable = 0; } else if(wrq->value == IW_AUTH_WPA_VERSION_WPA) { PRINT_K("iwctl_siwauth:set WPADEV to WPA1******\n"); @@ -1818,7 +1818,7 @@ int iwctl_siwauth(struct net_device *dev, break; case IW_AUTH_80211_AUTH_ALG: if(wrq->value==IW_AUTH_ALG_OPEN_SYSTEM){ - pMgmt->bShareKeyAlgorithm=FALSE; + pMgmt->bShareKeyAlgorithm = 0; }else if(wrq->value==IW_AUTH_ALG_SHARED_KEY){ pMgmt->bShareKeyAlgorithm = 1; } @@ -1833,13 +1833,13 @@ int iwctl_siwauth(struct net_device *dev, break; case IW_AUTH_PRIVACY_INVOKED: pDevice->bEncryptionEnable = !!wrq->value; - if(pDevice->bEncryptionEnable == FALSE){ + if(pDevice->bEncryptionEnable == 0){ wpa_version = 0; pairwise = 0; pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled; - pMgmt->bShareKeyAlgorithm = FALSE; - pMgmt->eAuthenMode = FALSE; - //pDevice->bWPADevEnable = FALSE; + pMgmt->bShareKeyAlgorithm = 0; + pMgmt->eAuthenMode = 0; + //pDevice->bWPADevEnable = 0; } break; @@ -1848,13 +1848,13 @@ int iwctl_siwauth(struct net_device *dev, break; } /* - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wpa_version = %d\n",wpa_version); - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pairwise = %d\n",pairwise); - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->eEncryptionStatus = %d\n",pDevice->eEncryptionStatus); - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pMgmt->eAuthenMode = %d\n",pMgmt->eAuthenMode); - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pMgmt->bShareKeyAlgorithm = %s\n",pMgmt->bShareKeyAlgorithm ? "1" :"FALSE"); - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->bEncryptionEnable = %s\n",pDevice->bEncryptionEnable ? "1" :"FALSE"); - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->bWPADevEnable = %s\n",pDevice->bWPADevEnable ? "1" :"FALSE"); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wpa_version = %d\n", wpa_version); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pairwise = %d\n", pairwise); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->eEncryptionStatus = %d\n", pDevice->eEncryptionStatus); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pMgmt->eAuthenMode = %d\n", pMgmt->eAuthenMode); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pMgmt->bShareKeyAlgorithm = %s\n", pMgmt->bShareKeyAlgorithm ? "1" : "0"); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->bEncryptionEnable = %s\n", pDevice->bEncryptionEnable ? "1" : "0"); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->bWPADevEnable = %s\n", pDevice->bWPADevEnable ? "1" : "0"); */ return ret; } diff --git a/drivers/staging/vt6655/key.c b/drivers/staging/vt6655/key.c index 6534158..b86ffc3 100644 --- a/drivers/staging/vt6655/key.c +++ b/drivers/staging/vt6655/key.c @@ -65,16 +65,16 @@ s_vCheckKeyTableValid (PSKeyManagement pTable, unsigned long dwIoBase) for (i=0;i<MAX_KEY_TABLE;i++) { if ((pTable->KeyTable[i].bInUse == 1) && - (pTable->KeyTable[i].PairwiseKey.bKeyValid == FALSE) && - (pTable->KeyTable[i].GroupKey[0].bKeyValid == FALSE) && - (pTable->KeyTable[i].GroupKey[1].bKeyValid == FALSE) && - (pTable->KeyTable[i].GroupKey[2].bKeyValid == FALSE) && - (pTable->KeyTable[i].GroupKey[3].bKeyValid == FALSE) + (pTable->KeyTable[i].PairwiseKey.bKeyValid == 0) && + (pTable->KeyTable[i].GroupKey[0].bKeyValid == 0) && + (pTable->KeyTable[i].GroupKey[1].bKeyValid == 0) && + (pTable->KeyTable[i].GroupKey[2].bKeyValid == 0) && + (pTable->KeyTable[i].GroupKey[3].bKeyValid == 0) ) { - pTable->KeyTable[i].bInUse = FALSE; + pTable->KeyTable[i].bInUse = 0; pTable->KeyTable[i].wKeyCtl = 0; - pTable->KeyTable[i].bSoftWEP = FALSE; + pTable->KeyTable[i].bSoftWEP = 0; MACvDisableKeyEntry(dwIoBase, i); } } @@ -102,16 +102,16 @@ void KeyvInitTable (PSKeyManagement pTable, unsigned long dwIoBase) int jj; for (i=0;i<MAX_KEY_TABLE;i++) { - pTable->KeyTable[i].bInUse = FALSE; - pTable->KeyTable[i].PairwiseKey.bKeyValid = FALSE; + pTable->KeyTable[i].bInUse = 0; + pTable->KeyTable[i].PairwiseKey.bKeyValid = 0; pTable->KeyTable[i].PairwiseKey.pvKeyTable = (void *)&pTable->KeyTable[i]; for (jj=0; jj < MAX_GROUP_KEY; jj++) { - pTable->KeyTable[i].GroupKey[jj].bKeyValid = FALSE; + pTable->KeyTable[i].GroupKey[jj].bKeyValid = 0; pTable->KeyTable[i].GroupKey[jj].pvKeyTable = (void *)&pTable->KeyTable[i]; } pTable->KeyTable[i].wKeyCtl = 0; pTable->KeyTable[i].dwGTKeyIndex = 0; - pTable->KeyTable[i].bSoftWEP = FALSE; + pTable->KeyTable[i].bSoftWEP = 0; MACvDisableKeyEntry(dwIoBase, i); } } @@ -128,7 +128,7 @@ void KeyvInitTable (PSKeyManagement pTable, unsigned long dwIoBase) * Out: * pKey - Key return * - * Return Value: 1 if found otherwise FALSE + * Return Value: 1 if found otherwise 0 * */ BOOL KeybGetKey ( @@ -151,24 +151,21 @@ BOOL KeybGetKey ( *pKey = &(pTable->KeyTable[i].PairwiseKey); return 1; } - else { - return (FALSE); - } + else + return 0; } else if (dwKeyIndex < MAX_GROUP_KEY) { if (pTable->KeyTable[i].GroupKey[dwKeyIndex].bKeyValid == 1) { *pKey = &(pTable->KeyTable[i].GroupKey[dwKeyIndex]); return 1; } - else { - return (FALSE); - } - } - else { - return (FALSE); + else + return 0; } + else + return 0; } } - return (FALSE); + return 0; } @@ -186,7 +183,7 @@ BOOL KeybGetKey ( * Out: * none * - * Return Value: 1 if success otherwise FALSE + * Return Value: 1 if success otherwise 0 * */ BOOL KeybSetKey ( @@ -210,7 +207,7 @@ BOOL KeybSetKey ( j = (MAX_KEY_TABLE-1); for (i=0;i<(MAX_KEY_TABLE-1);i++) { - if ((pTable->KeyTable[i].bInUse == FALSE) && + if ((pTable->KeyTable[i].bInUse == 0) && (j == (MAX_KEY_TABLE-1))) { // found empty table j = i; @@ -227,7 +224,7 @@ BOOL KeybSetKey ( } else { // Group key if ((dwKeyIndex & 0x000000FF) >= MAX_GROUP_KEY) - return (FALSE); + return 0; pKey = &(pTable->KeyTable[i].GroupKey[dwKeyIndex & 0x000000FF]); if ((dwKeyIndex & TRANSMIT_KEY) != 0) { // Group transmit key @@ -292,7 +289,7 @@ BOOL KeybSetKey ( } else { // Group key if ((dwKeyIndex & 0x000000FF) >= MAX_GROUP_KEY) - return (FALSE); + return 0; pKey = &(pTable->KeyTable[j].GroupKey[dwKeyIndex & 0x000000FF]); if ((dwKeyIndex & TRANSMIT_KEY) != 0) { // Group transmit key @@ -344,7 +341,7 @@ BOOL KeybSetKey ( return 1; } - return (FALSE); + return 0; } @@ -359,7 +356,7 @@ BOOL KeybSetKey ( * Out: * none * - * Return Value: 1 if success otherwise FALSE + * Return Value: 1 if success otherwise 0 * */ BOOL KeybRemoveKey ( @@ -375,14 +372,14 @@ BOOL KeybRemoveKey ( // dealte all key if ((dwKeyIndex & PAIRWISE_KEY) != 0) { for (i=0;i<MAX_KEY_TABLE;i++) { - pTable->KeyTable[i].PairwiseKey.bKeyValid = FALSE; + pTable->KeyTable[i].PairwiseKey.bKeyValid = 0; } s_vCheckKeyTableValid(pTable, dwIoBase); return 1; } else if ((dwKeyIndex & 0x000000FF) < MAX_GROUP_KEY) { for (i=0;i<MAX_KEY_TABLE;i++) { - pTable->KeyTable[i].GroupKey[dwKeyIndex & 0x000000FF].bKeyValid = FALSE; + pTable->KeyTable[i].GroupKey[dwKeyIndex & 0x000000FF].bKeyValid = 0; if ((dwKeyIndex & 0x7FFFFFFF) == (pTable->KeyTable[i].dwGTKeyIndex & 0x7FFFFFFF)) { // remove Group transmit key pTable->KeyTable[i].dwGTKeyIndex = 0; @@ -392,7 +389,7 @@ BOOL KeybRemoveKey ( return 1; } else { - return FALSE; + return 0; } } @@ -400,12 +397,12 @@ BOOL KeybRemoveKey ( if ((pTable->KeyTable[i].bInUse == 1) && !compare_ether_addr(pTable->KeyTable[i].abyBSSID, pbyBSSID)) { if ((dwKeyIndex & PAIRWISE_KEY) != 0) { - pTable->KeyTable[i].PairwiseKey.bKeyValid = FALSE; + pTable->KeyTable[i].PairwiseKey.bKeyValid = 0; s_vCheckKeyTableValid(pTable, dwIoBase); return 1; } else if ((dwKeyIndex & 0x000000FF) < MAX_GROUP_KEY) { - pTable->KeyTable[i].GroupKey[dwKeyIndex & 0x000000FF].bKeyValid = FALSE; + pTable->KeyTable[i].GroupKey[dwKeyIndex & 0x000000FF].bKeyValid = 0; if ((dwKeyIndex & 0x7FFFFFFF) == (pTable->KeyTable[i].dwGTKeyIndex & 0x7FFFFFFF)) { // remove Group transmit key pTable->KeyTable[i].dwGTKeyIndex = 0; @@ -414,11 +411,11 @@ BOOL KeybRemoveKey ( return 1; } else { - return (FALSE); + return 0; } } } - return (FALSE); + return 0; } @@ -432,7 +429,7 @@ BOOL KeybRemoveKey ( * Out: * none * - * Return Value: 1 if success otherwise FALSE + * Return Value: 1 if success otherwise 0 * */ BOOL KeybRemoveAllKey ( @@ -446,16 +443,16 @@ BOOL KeybRemoveAllKey ( for (i=0;i<MAX_KEY_TABLE;i++) { if ((pTable->KeyTable[i].bInUse == 1) && !compare_ether_addr(pTable->KeyTable[i].abyBSSID, pbyBSSID)) { - pTable->KeyTable[i].PairwiseKey.bKeyValid = FALSE; + pTable->KeyTable[i].PairwiseKey.bKeyValid = 0; for(u=0;u<MAX_GROUP_KEY;u++) { - pTable->KeyTable[i].GroupKey[u].bKeyValid = FALSE; + pTable->KeyTable[i].GroupKey[u].bKeyValid = 0; } pTable->KeyTable[i].dwGTKeyIndex = 0; s_vCheckKeyTableValid(pTable, dwIoBase); return 1; } } - return (FALSE); + return 0; } /* @@ -467,7 +464,7 @@ BOOL KeybRemoveAllKey ( * Out: * none * - * Return Value: 1 if success otherwise FALSE + * Return Value: 1 if success otherwise 0 * */ void KeyvRemoveWEPKey ( @@ -480,7 +477,7 @@ void KeyvRemoveWEPKey ( if ((dwKeyIndex & 0x000000FF) < MAX_GROUP_KEY) { if (pTable->KeyTable[MAX_KEY_TABLE-1].bInUse == 1) { if (pTable->KeyTable[MAX_KEY_TABLE-1].GroupKey[dwKeyIndex & 0x000000FF].byCipherSuite == KEY_CTL_WEP) { - pTable->KeyTable[MAX_KEY_TABLE-1].GroupKey[dwKeyIndex & 0x000000FF].bKeyValid = FALSE; + pTable->KeyTable[MAX_KEY_TABLE-1].GroupKey[dwKeyIndex & 0x000000FF].bKeyValid = 0; if ((dwKeyIndex & 0x7FFFFFFF) == (pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex & 0x7FFFFFFF)) { // remove Group transmit key pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex = 0; @@ -514,7 +511,7 @@ void KeyvRemoveAllWEPKey ( * Out: * pKey - Key return * - * Return Value: 1 if found otherwise FALSE + * Return Value: 1 if found otherwise 0 * */ BOOL KeybGetTransmitKey ( @@ -547,14 +544,14 @@ BOOL KeybGetTransmitKey ( return 1; } else { - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"PairwiseKey.bKeyValid == FALSE\n"); - return (FALSE); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"PairwiseKey.bKeyValid == 0\n"); + return 0; } } // End of Type == PAIRWISE else { if (pTable->KeyTable[i].dwGTKeyIndex == 0) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ERROR: dwGTKeyIndex == 0 !!!\n"); - return FALSE; + return 0; } if (pTable->KeyTable[i].GroupKey[(pTable->KeyTable[i].dwGTKeyIndex&0x000000FF)].bKeyValid == 1) { *pKey = &(pTable->KeyTable[i].GroupKey[(pTable->KeyTable[i].dwGTKeyIndex&0x000000FF)]); @@ -570,8 +567,8 @@ BOOL KeybGetTransmitKey ( return 1; } else { - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"GroupKey.bKeyValid == FALSE\n"); - return (FALSE); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"GroupKey.bKeyValid == 0\n"); + return 0; } } // End of Type = GROUP } // BSSID match @@ -581,7 +578,7 @@ BOOL KeybGetTransmitKey ( DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02x ", *(pbyBSSID+ii)); } DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n"); - return (FALSE); + return 0; } @@ -594,7 +591,7 @@ BOOL KeybGetTransmitKey ( * Out: * none * - * Return Value: 1 if found otherwise FALSE + * Return Value: 1 if found otherwise 0 * */ BOOL KeybCheckPairewiseKey ( @@ -612,7 +609,7 @@ BOOL KeybCheckPairewiseKey ( return 1; } } - return (FALSE); + return 0; } /* @@ -628,7 +625,7 @@ BOOL KeybCheckPairewiseKey ( * Out: * none * - * Return Value: 1 if success otherwise FALSE + * Return Value: 1 if success otherwise 0 * */ BOOL KeybSetDefaultKey ( @@ -650,9 +647,9 @@ BOOL KeybSetDefaultKey ( if ((dwKeyIndex & PAIRWISE_KEY) != 0) { // Pairwise key - return (FALSE); + return 0; } else if ((dwKeyIndex & 0x000000FF) >= MAX_GROUP_KEY) { - return (FALSE); + return 0; } pTable->KeyTable[MAX_KEY_TABLE-1].bInUse = 1; @@ -678,7 +675,7 @@ BOOL KeybSetDefaultKey ( pTable->KeyTable[MAX_KEY_TABLE-1].wKeyCtl |= 0x4000; // disable on-fly disable address match pTable->KeyTable[MAX_KEY_TABLE-1].bSoftWEP = 1; } else { - if (pTable->KeyTable[MAX_KEY_TABLE-1].bSoftWEP == FALSE) + if (pTable->KeyTable[MAX_KEY_TABLE-1].bSoftWEP == 0) pTable->KeyTable[MAX_KEY_TABLE-1].wKeyCtl |= 0xC000; // enable on-fly disable address match } @@ -735,7 +732,7 @@ BOOL KeybSetDefaultKey ( * Out: * none * - * Return Value: 1 if success otherwise FALSE + * Return Value: 1 if success otherwise 0 * */ BOOL KeybSetAllGroupKey ( @@ -758,9 +755,9 @@ BOOL KeybSetAllGroupKey ( if ((dwKeyIndex & PAIRWISE_KEY) != 0) { // Pairwise key - return (FALSE); + return 0; } else if ((dwKeyIndex & 0x000000FF) >= MAX_GROUP_KEY) { - return (FALSE); + return 0; } for (i=0; i < MAX_KEY_TABLE-1; i++) { diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index c0f6d45..e311db6 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -137,7 +137,7 @@ void MACvReadAllRegs (unsigned long dwIoBase, unsigned char *pbyMacRegs) * Out: * none * - * Return Value: 1 if all test bits On; otherwise FALSE + * Return Value: 1 if all test bits On; otherwise 0 * */ BOOL MACbIsRegBitsOn (unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits) @@ -160,7 +160,7 @@ BOOL MACbIsRegBitsOn (unsigned long dwIoBase, unsigned char byRegOfs, unsigned c * Out: * none * - * Return Value: 1 if all test bits Off; otherwise FALSE + * Return Value: 1 if all test bits Off; otherwise 0 * */ BOOL MACbIsRegBitsOff (unsigned long dwIoBase, unsigned char byRegOfs, unsigned char byTestBits) @@ -181,7 +181,7 @@ BOOL MACbIsRegBitsOff (unsigned long dwIoBase, unsigned char byRegOfs, unsigned * Out: * none * - * Return Value: 1 if interrupt is disable; otherwise FALSE + * Return Value: 1 if interrupt is disable; otherwise 0 * */ BOOL MACbIsIntDisable (unsigned long dwIoBase) @@ -190,7 +190,7 @@ BOOL MACbIsIntDisable (unsigned long dwIoBase) VNSvInPortD(dwIoBase + MAC_REG_IMR, &dwData); if (dwData != 0) - return FALSE; + return 0; return 1; } @@ -556,7 +556,7 @@ void MACvSetLoopbackMode (unsigned long dwIoBase, unsigned char byLoopbackMode) * Out: * none * - * Return Value: 1 if in Loopback mode; otherwise FALSE + * Return Value: 1 if in Loopback mode; otherwise 0 * */ BOOL MACbIsInLoopbackMode (unsigned long dwIoBase) @@ -566,7 +566,7 @@ BOOL MACbIsInLoopbackMode (unsigned long dwIoBase) VNSvInPortB(dwIoBase + MAC_REG_TEST, &byOrgValue); if (byOrgValue & (TEST_LBINT | TEST_LBEXT)) return 1; - return FALSE; + return 0; } /* @@ -725,7 +725,7 @@ void MACvRestoreContext (unsigned long dwIoBase, unsigned char *pbyCxtBuf) * Out: * none * - * Return Value: 1 if all values are the same; otherwise FALSE + * Return Value: 1 if all values are the same; otherwise 0 * */ BOOL MACbCompareContext (unsigned long dwIoBase, unsigned char *pbyCxtBuf) @@ -733,27 +733,27 @@ BOOL MACbCompareContext (unsigned long dwIoBase, unsigned char *pbyCxtBuf) unsigned long dwData; // compare MAC context to determine if this is a power lost init, - // return 1 for power remaining init, return FALSE for power lost init + // return 1 for power remaining init, return 0 for power lost init // compare CURR_RX_DESC_ADDR, CURR_TX_DESC_ADDR VNSvInPortD(dwIoBase + MAC_REG_TXDMAPTR0, &dwData); if (dwData != *(unsigned long *)(pbyCxtBuf + MAC_REG_TXDMAPTR0)) { - return FALSE; + return 0; } VNSvInPortD(dwIoBase + MAC_REG_AC0DMAPTR, &dwData); if (dwData != *(unsigned long *)(pbyCxtBuf + MAC_REG_AC0DMAPTR)) { - return FALSE; + return 0; } VNSvInPortD(dwIoBase + MAC_REG_RXDMAPTR0, &dwData); if (dwData != *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR0)) { - return FALSE; + return 0; } VNSvInPortD(dwIoBase + MAC_REG_RXDMAPTR1, &dwData); if (dwData != *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR1)) { - return FALSE; + return 0; } @@ -770,7 +770,7 @@ BOOL MACbCompareContext (unsigned long dwIoBase, unsigned char *pbyCxtBuf) * Out: * none * - * Return Value: 1 if Reset Success; otherwise FALSE + * Return Value: 1 if Reset Success; otherwise 0 * */ BOOL MACbSoftwareReset (unsigned long dwIoBase) @@ -788,7 +788,7 @@ BOOL MACbSoftwareReset (unsigned long dwIoBase) break; } if (ww == W_MAX_TIMEOUT) - return FALSE; + return 0; return 1; } @@ -803,7 +803,7 @@ BOOL MACbSoftwareReset (unsigned long dwIoBase) * Out: * none * - * Return Value: 1 if success; otherwise FALSE + * Return Value: 1 if success; otherwise 0 * */ BOOL MACbSafeSoftwareReset (unsigned long dwIoBase) @@ -836,7 +836,7 @@ BOOL MACbSafeSoftwareReset (unsigned long dwIoBase) * Out: * none * - * Return Value: 1 if success; otherwise FALSE + * Return Value: 1 if success; otherwise 0 * */ BOOL MACbSafeRxOff (unsigned long dwIoBase) @@ -858,7 +858,7 @@ BOOL MACbSafeRxOff (unsigned long dwIoBase) if (ww == W_MAX_TIMEOUT) { DBG_PORT80(0x10); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x10)\n"); - return(FALSE); + return 0; } for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { VNSvInPortD(dwIoBase + MAC_REG_RXDMACTL1, &dwData); @@ -868,7 +868,7 @@ BOOL MACbSafeRxOff (unsigned long dwIoBase) if (ww == W_MAX_TIMEOUT) { DBG_PORT80(0x11); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x11)\n"); - return(FALSE); + return 0; } // try to safe shutdown RX @@ -882,7 +882,7 @@ BOOL MACbSafeRxOff (unsigned long dwIoBase) if (ww == W_MAX_TIMEOUT) { DBG_PORT80(0x12); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x12)\n"); - return(FALSE); + return 0; } return 1; } @@ -897,7 +897,7 @@ BOOL MACbSafeRxOff (unsigned long dwIoBase) * Out: * none * - * Return Value: 1 if success; otherwise FALSE + * Return Value: 1 if success; otherwise 0 * */ BOOL MACbSafeTxOff (unsigned long dwIoBase) @@ -921,7 +921,7 @@ BOOL MACbSafeTxOff (unsigned long dwIoBase) if (ww == W_MAX_TIMEOUT) { DBG_PORT80(0x20); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x20)\n"); - return(FALSE); + return 0; } for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { VNSvInPortD(dwIoBase + MAC_REG_AC0DMACTL, &dwData); @@ -931,7 +931,7 @@ BOOL MACbSafeTxOff (unsigned long dwIoBase) if (ww == W_MAX_TIMEOUT) { DBG_PORT80(0x21); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x21)\n"); - return(FALSE); + return 0; } // try to safe shutdown TX @@ -946,7 +946,7 @@ BOOL MACbSafeTxOff (unsigned long dwIoBase) if (ww == W_MAX_TIMEOUT) { DBG_PORT80(0x24); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x24)\n"); - return(FALSE); + return 0; } return 1; } @@ -961,24 +961,24 @@ BOOL MACbSafeTxOff (unsigned long dwIoBase) * Out: * none * - * Return Value: 1 if success; otherwise FALSE + * Return Value: 1 if success; otherwise 0 * */ BOOL MACbSafeStop (unsigned long dwIoBase) { MACvRegBitsOff(dwIoBase, MAC_REG_TCR, TCR_AUTOBCNTX); - if (MACbSafeRxOff(dwIoBase) == FALSE) { + if (MACbSafeRxOff(dwIoBase) == 0) { DBG_PORT80(0xA1); - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" MACbSafeRxOff == FALSE)\n"); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" MACbSafeRxOff == 0)\n"); MACbSafeSoftwareReset(dwIoBase); - return FALSE; + return 0; } - if (MACbSafeTxOff(dwIoBase) == FALSE) { + if (MACbSafeTxOff(dwIoBase) == 0) { DBG_PORT80(0xA2); - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" MACbSafeTxOff == FALSE)\n"); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" MACbSafeTxOff == 0)\n"); MACbSafeSoftwareReset(dwIoBase); - return FALSE; + return 0; } MACvRegBitsOff(dwIoBase, MAC_REG_HOSTCR, HOSTCR_MACEN); @@ -996,7 +996,7 @@ BOOL MACbSafeStop (unsigned long dwIoBase) * Out: * none * - * Return Value: 1 if success; otherwise FALSE + * Return Value: 1 if success; otherwise 0 * */ BOOL MACbShutdown (unsigned long dwIoBase) @@ -1007,7 +1007,7 @@ BOOL MACbShutdown (unsigned long dwIoBase) // stop the adapter if (!MACbSafeStop(dwIoBase)) { MACvSetLoopbackMode(dwIoBase, MAC_LB_NONE); - return FALSE; + return 0; } MACvSetLoopbackMode(dwIoBase, MAC_LB_NONE); return 1; @@ -1342,7 +1342,7 @@ unsigned int ww = 0; if (ww == W_MAX_TIMEOUT) { DBG_PORT80(0x29); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x29)\n"); - return FALSE; + return 0; } return 1; } @@ -1435,7 +1435,7 @@ BOOL MACbPSWakeup (unsigned long dwIoBase) if (ww == W_MAX_TIMEOUT) { DBG_PORT80(0x36); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x33)\n"); - return FALSE; + return 0; } return 1; } diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c index 1bb87e1..877b51d 100644 --- a/drivers/staging/vt6655/power.c +++ b/drivers/staging/vt6655/power.c @@ -161,12 +161,12 @@ PSvDisablePowerSaving( // set always listen beacon MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_ALBCN); - pDevice->bEnablePSMode = FALSE; + pDevice->bEnablePSMode = 0; if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) { PSbSendNullPacket(pDevice); } - pDevice->bPWBitOn = FALSE; + pDevice->bPWBitOn = 0; return; } @@ -178,7 +178,7 @@ PSvDisablePowerSaving( * * Return Value: * 1, if power down success - * FALSE, if fail + * 0, if fail -*/ @@ -200,12 +200,12 @@ PSbConsiderPowerDown( if (pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) { // check if in TIM wake period if (pMgmt->bInTIMWake) - return FALSE; + return 0; } // check scan state if (pDevice->bCmdRunning) - return FALSE; + return 0; // Froce PSEN on MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PSEN); @@ -213,20 +213,20 @@ PSbConsiderPowerDown( // check if all TD are empty, for (uIdx = 0; uIdx < TYPE_MAXTD; uIdx ++) { if (pDevice->iTDUsed[uIdx] != 0) - return FALSE; + return 0; } // check if rx isr is clear if (bCheckRxDMA && ((pDevice->dwIsr& ISR_RXDMA0) != 0) && ((pDevice->dwIsr & ISR_RXDMA1) != 0)){ - return FALSE; + return 0; }; if (pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) { if (bCheckCountToWakeUp && (pMgmt->wCountToWakeUp == 0 || pMgmt->wCountToWakeUp == 1)) { - return FALSE; + return 0; } } @@ -307,23 +307,23 @@ PSbSendNullPacket( unsigned int uIdx; - if (pDevice->bLinkPass == FALSE) { - return FALSE; + if (pDevice->bLinkPass == 0) { + return 0; } #ifdef TxInSleep - if ((pDevice->bEnablePSMode == FALSE) && - (pDevice->fTxDataInSleep == FALSE)){ - return FALSE; + if ((pDevice->bEnablePSMode == 0) && + (pDevice->fTxDataInSleep == 0)){ + return 0; } #else - if (pDevice->bEnablePSMode == FALSE) { - return FALSE; + if (pDevice->bEnablePSMode == 0) { + return 0; } #endif if (pDevice->bEnablePSMode) { for (uIdx = 0; uIdx < TYPE_MAXTD; uIdx ++) { if (pDevice->iTDUsed[uIdx] != 0) - return FALSE; + return 0; } } @@ -361,7 +361,7 @@ PSbSendNullPacket( // send the frame if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send Null Packet failed !\n"); - return FALSE; + return 0; } else { @@ -390,7 +390,7 @@ PSbIsNextTBTTWakeUp( PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = pDevice->pMgmt; - BOOL bWakeUp = FALSE; + BOOL bWakeUp = 0; if (pMgmt->wListenInterval >= 2) { if (pMgmt->wCountToWakeUp == 0) { diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index 627b8fc..af43ddd 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -471,7 +471,7 @@ const unsigned long dwAL7230ChannelTable2[CB_MAX_CHANNEL] = { * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ BOOL s_bAL7230Init (unsigned long dwIoBase) @@ -552,7 +552,7 @@ BOOL s_bAL7230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ @@ -567,7 +567,7 @@ BOOL s_bAL7230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ @@ -585,7 +585,7 @@ BOOL s_bAL7230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ @@ -599,7 +599,7 @@ BOOL s_bAL7230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ @@ -619,7 +619,7 @@ BOOL s_bAL7230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ BOOL IFRFbWriteEmbeded (unsigned long dwIoBase, unsigned long dwData) @@ -638,7 +638,7 @@ BOOL IFRFbWriteEmbeded (unsigned long dwIoBase, unsigned long dwData) if (ww == W_MAX_TIMEOUT) { // DBG_PORT80_ALWAYS(0x32); - return FALSE; + return 0; } return 1; } @@ -654,7 +654,7 @@ BOOL IFRFbWriteEmbeded (unsigned long dwIoBase, unsigned long dwData) * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ @@ -668,7 +668,7 @@ BOOL IFRFbWriteEmbeded (unsigned long dwIoBase, unsigned long dwData) * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ @@ -681,7 +681,7 @@ BOOL IFRFbWriteEmbeded (unsigned long dwIoBase, unsigned long dwData) * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ BOOL RFbAL2230Init (unsigned long dwIoBase) @@ -761,7 +761,7 @@ BOOL RFbAL2230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ @@ -776,7 +776,7 @@ BOOL RFbAL2230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ @@ -790,7 +790,7 @@ BOOL RFbAL2230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ @@ -804,7 +804,7 @@ BOOL RFbAL2230SelectChannel (unsigned long dwIoBase, unsigned char byChannel) * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ BOOL RFbInit ( @@ -826,7 +826,7 @@ BOOL bResult = 1; bResult = 1; break; default : - bResult = FALSE; + bResult = 0; break; } return bResult; @@ -842,7 +842,7 @@ BOOL bResult = 1; * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ BOOL RFbShutDown ( @@ -872,7 +872,7 @@ BOOL bResult = 1; * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ BOOL RFbSelectChannel (unsigned long dwIoBase, unsigned char byRFType, unsigned char byChannel) @@ -893,7 +893,7 @@ BOOL bResult = 1; bResult = 1; break; default: - bResult = FALSE; + bResult = 0; break; } return bResult; @@ -923,12 +923,12 @@ BOOL RFvWriteWakeProgSyn (unsigned long dwIoBase, unsigned char byRFType, unsign case RF_AL2230S: if (uChannel > CB_MAX_CHANNEL_24G) - return FALSE; + return 0; byInitCount = CB_AL2230_INIT_SEQ + 2; // Init Reg + Channel Reg (2) bySleepCount = 0; if (byInitCount > (MISCFIFO_SYNDATASIZE - bySleepCount)) { - return FALSE; + return 0; } for (ii = 0; ii < CB_AL2230_INIT_SEQ; ii++ ) { @@ -945,7 +945,7 @@ BOOL RFvWriteWakeProgSyn (unsigned long dwIoBase, unsigned char byRFType, unsign byInitCount = CB_AL7230_INIT_SEQ + 3; // Init Reg + Channel Reg (3) bySleepCount = 0; if (byInitCount > (MISCFIFO_SYNDATASIZE - bySleepCount)) { - return FALSE; + return 0; } if (uChannel <= CB_MAX_CHANNEL_24G) @@ -974,7 +974,7 @@ BOOL RFvWriteWakeProgSyn (unsigned long dwIoBase, unsigned char byRFType, unsign break; default: - return FALSE; + return 0; break; } @@ -993,7 +993,7 @@ BOOL RFvWriteWakeProgSyn (unsigned long dwIoBase, unsigned char byRFType, unsign * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ BOOL RFbSetPower ( @@ -1011,7 +1011,7 @@ unsigned char byPwrdBm = 0; return 1; } if ((uCH < 1) || (uCH > CB_MAX_CHANNEL)) { - return FALSE; + return 0; } switch (uRATE) { @@ -1131,7 +1131,7 @@ unsigned char byPwrdBm = 0; * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ @@ -1145,7 +1145,7 @@ BOOL bResult = 1; unsigned long dwMax7230Pwr = 0; if (byPwr >= pDevice->byMaxPwrLevel) { - return (FALSE); + return 0; } switch (pDevice->byRFType) { diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 9b735e7..d77d60f 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -603,7 +603,7 @@ s_uGetDataDuration ( break; } - ASSERT(FALSE); + ASSERT(0); return 0; } @@ -1156,7 +1156,7 @@ s_vGenerateTxParameter ( { unsigned int cbMACHdLen = WLAN_HDR_ADDR3_LEN; //24 unsigned short wFifoCtl; - BOOL bDisCRC = FALSE; + BOOL bDisCRC = 0; unsigned char byFBOption = AUTO_FB_NONE; // unsigned short wCurrentRate = pDevice->wCurrentRate; @@ -1340,7 +1340,7 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT unsigned long *pdwMIC_L; unsigned long *pdwMIC_R; unsigned long dwSafeMIC_L, dwSafeMIC_R; //Fix "Last Frag Size" < "MIC length". - BOOL bMIC2Frag = FALSE; + BOOL bMIC2Frag = 0; unsigned int uMICFragLen = 0; unsigned int uMACfragNum = 1; unsigned int uPadding = 0; @@ -1362,7 +1362,7 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT unsigned short wTxBufSize; // FFinfo size unsigned int uTotalCopyLength = 0; unsigned char byFBOption = AUTO_FB_NONE; - BOOL bIsWEP256 = FALSE; + BOOL bIsWEP256 = 0; PSMgmtObject pMgmt = pDevice->pMgmt; @@ -1373,7 +1373,7 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT (pDevice->eOPMode == OP_MODE_AP)) { if (is_multicast_ether_addr(&(psEthHeader->abyDstAddr[0]))) - bNeedACK = FALSE; + bNeedACK = 0; else bNeedACK = 1; bIsAdhoc = 1; @@ -1381,7 +1381,7 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT else { // MSDUs in Infra mode always need ACK bNeedACK = 1; - bIsAdhoc = FALSE; + bIsAdhoc = 0; } if (pDevice->bLongHeader) @@ -1418,11 +1418,11 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT cbFrameSize = cbMACHdLen + cbIVlen + (cbFrameBodySize + cbMIClen) + cbICVlen + cbFCSlen; - if ((bNeedACK == FALSE) || + if ((bNeedACK == 0) || (cbFrameSize < pDevice->wRTSThreshold) || ((cbFrameSize >= pDevice->wFragmentationThreshold) && (pDevice->wFragmentationThreshold <= pDevice->wRTSThreshold)) ) { - bRTS = FALSE; + bRTS = 0; } else { bRTS = 1; @@ -1549,7 +1549,7 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT pbyPayloadHead = (unsigned char *)(pbyMacHdr + cbMACHdLen + uPadding + cbIVlen); pbyIVHead = (unsigned char *)(pbyMacHdr + cbMACHdLen + uPadding); - if ((cbFrameSize > pDevice->wFragmentationThreshold) && (bNeedACK == 1) && (bIsWEP256 == FALSE)) { + if ((cbFrameSize > pDevice->wFragmentationThreshold) && (bNeedACK == 1) && (bIsWEP256 == 0)) { // Fragmentation // FragThreshold = Fragment size(Hdr+(IV)+fragment payload+(MIC)+(ICV)+FCS) cbFragmentSize = pDevice->wFragmentationThreshold; @@ -1718,7 +1718,7 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT memcpy(pbyBuffer, (void *)psTxBufHd, uLength); // Copy the Packet into a tx Buffer - if (bMIC2Frag == FALSE) { + if (bMIC2Frag == 0) { memcpy((pbyBuffer + uLength), (pPacket + 14 + uTotalCopyLength), @@ -1732,7 +1732,7 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"LAST: uMICFragLen:%d, cbLastFragPayloadSize:%d, uTmpLen:%d\n", uMICFragLen, cbLastFragPayloadSize, uTmpLen); - if (bMIC2Frag == FALSE) { + if (bMIC2Frag == 0) { if (uTmpLen != 0) MIC_vAppend((pbyBuffer + uLength), uTmpLen); pdwMIC_L = (unsigned long *)(pbyBuffer + uLength + uTmpLen); @@ -2020,7 +2020,7 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT if (pDevice->bTxMICFail == 1) { *pdwMIC_L = 0; *pdwMIC_R = 0; - pDevice->bTxMICFail = FALSE; + pDevice->bTxMICFail = 0; } DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"uLength: %d, %d\n", uLength, cbFrameBodySize); @@ -2089,7 +2089,7 @@ vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktType, unsigned char *pb if ((pDevice->eOPMode == OP_MODE_ADHOC) || (pDevice->eOPMode == OP_MODE_AP)) { if (is_multicast_ether_addr(&(psEthHeader->abyDstAddr[0]))) { - bNeedACK = FALSE; + bNeedACK = 0; pTxBufHead->wFIFOCtl = pTxBufHead->wFIFOCtl & (~FIFOCTL_NEEDACK); } else { @@ -2102,7 +2102,7 @@ vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktType, unsigned char *pb // MSDUs in Infra mode always need ACK bNeedACK = 1; pTxBufHead->wFIFOCtl |= FIFOCTL_NEEDACK; - bIsAdhoc = FALSE; + bIsAdhoc = 0; } @@ -2159,7 +2159,7 @@ vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktType, unsigned char *pb } //Set FRAGCTL_WEPTYP - pDevice->bAES = FALSE; + pDevice->bAES = 0; //Set FRAGCTL_WEPTYP if (pDevice->byLocalID > REV_ID_VT3253_A1) { @@ -2315,7 +2315,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { unsigned int cbHeaderSize; unsigned int cbFrameBodySize; BOOL bNeedACK; - BOOL bIsPSPOLL = FALSE; + BOOL bIsPSPOLL = 0; PSTxBufHead pTxBufHead; unsigned int cbFrameSize; unsigned int cbIVlen = 0; @@ -2389,7 +2389,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { if (is_multicast_ether_addr(&(pPacket->p80211Header->sA3.abyAddr1[0]))) - bNeedACK = FALSE; + bNeedACK = 0; else { bNeedACK = 1; pTxBufHead->wFIFOCtl |= FIFOCTL_NEEDACK; @@ -2403,7 +2403,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { //pDevice->byPreambleType = PREAMBLE_LONG; // probe-response don't retry //if ((pPacket->p80211Header->sA4.wFrameCtl & TYPE_SUBTYPE_MASK) == TYPE_MGMT_PROBE_RSP) { - // bNeedACK = FALSE; + // bNeedACK = 0; // pTxBufHead->wFIFOCtl &= (~FIFOCTL_NEEDACK); //} } @@ -2423,7 +2423,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { // Notes: // Although spec says MMPDU can be fragmented; In most case, // no one will send a MMPDU under fragmentation. With RTS may occur. - pDevice->bAES = FALSE; //Set FRAGCTL_WEPTYP + pDevice->bAES = 0; //Set FRAGCTL_WEPTYP if (WLAN_GET_FC_ISWEP(pPacket->p80211Header->sA4.wFrameCtl) != 0) { if (pDevice->eEncryptionStatus == Ndis802_11Encryption1Enabled) { @@ -2527,7 +2527,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { (pDevice->bLinkPass == 1)) { pbyBSSID = pDevice->abyBSSID; // get pairwise key - if (KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, PAIRWISE_KEY, &pTransmitKey) == FALSE) { + if (KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, PAIRWISE_KEY, &pTransmitKey) == 0) { // get group key if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == 1) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Get GTK.\n"); @@ -2540,13 +2540,13 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { } // get group key pbyBSSID = pDevice->abyBroadcastAddr; - if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == FALSE) { + if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == 0) { pTransmitKey = NULL; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"KEY is NULL. OP Mode[%d]\n", pDevice->eOPMode); } else { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Get GTK.\n"); } - } while(FALSE); + } while(0); //Fill TXKEY s_vFillTxKey(pDevice, (unsigned char *)(pTxBufHead->adwTxKey), pbyIVHead, pTransmitKey, (unsigned char *)pMACHeader, (unsigned short)cbFrameBodySize, NULL); @@ -2592,7 +2592,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { // Disable PS MACbPSWakeup(pDevice->PortOffset); } - pDevice->bPWBitOn = FALSE; + pDevice->bPWBitOn = 0; wmb(); pFrstTD->m_td0TD0.f1Owner = OWNED_BY_NIC; @@ -2656,12 +2656,12 @@ CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { //Set packet type & Get Duration if (byPktType == PK_TYPE_11A) {//0000 0000 0000 0000 pTxDataHead->wDuration = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameSize, byPktType, - wCurrentRate, FALSE, 0, 0, 1, AUTO_FB_NONE)); + wCurrentRate, 0, 0, 0, 1, AUTO_FB_NONE)); } else if (byPktType == PK_TYPE_11B) {//0000 0001 0000 0000 pTxBufHead->wFIFOCtl |= FIFOCTL_11B; pTxDataHead->wDuration = cpu_to_le16((unsigned short)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameSize, byPktType, - wCurrentRate, FALSE, 0, 0, 1, AUTO_FB_NONE)); + wCurrentRate, 0, 0, 0, 1, AUTO_FB_NONE)); } BBvCaculateParameter(pDevice, cbFrameSize, wCurrentRate, byPktType, @@ -2723,7 +2723,7 @@ cbGetFragCount ( if ((pDevice->eOPMode == OP_MODE_ADHOC) || (pDevice->eOPMode == OP_MODE_AP)) { if (is_multicast_ether_addr(&(psEthHeader->abyDstAddr[0]))) - bNeedACK = FALSE; + bNeedACK = 0; else bNeedACK = 1; } @@ -2799,7 +2799,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un unsigned int cbHeaderSize; unsigned int cbFrameBodySize; BOOL bNeedACK; - BOOL bIsPSPOLL = FALSE; + BOOL bIsPSPOLL = 0; PSTxBufHead pTxBufHead; unsigned int cbFrameSize; unsigned int cbIVlen = 0; @@ -2822,7 +2822,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un unsigned short wCurrentRate = RATE_1M; PUWLAN_80211HDR p80211Header; unsigned int uNodeIndex = 0; - BOOL bNodeExist = FALSE; + BOOL bNodeExist = 0; SKeyItem STempKey; PSKeyItem pTransmitKey = NULL; unsigned char *pbyIVHead; @@ -2898,7 +2898,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un if (is_multicast_ether_addr(&(p80211Header->sA3.abyAddr1[0]))) { - bNeedACK = FALSE; + bNeedACK = 0; if (pDevice->bEnableHostWEP) { uNodeIndex = 0; bNodeExist = 1; @@ -2922,7 +2922,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un // probe-response don't retry //if ((p80211Header->sA4.wFrameCtl & TYPE_SUBTYPE_MASK) == TYPE_MGMT_PROBE_RSP) { - // bNeedACK = FALSE; + // bNeedACK = 0; // pTxBufHead->wFIFOCtl &= (~FIFOCTL_NEEDACK); //} } @@ -2959,7 +2959,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un // Notes: // Although spec says MMPDU can be fragmented; In most case, // no one will send a MMPDU under fragmentation. With RTS may occur. - pDevice->bAES = FALSE; //Set FRAGCTL_WEPTYP + pDevice->bAES = 0; //Set FRAGCTL_WEPTYP if (WLAN_GET_FC_ISWEP(p80211Header->sA4.wFrameCtl) != 0) { @@ -3108,7 +3108,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un if (pDevice->bTxMICFail == 1) { *pdwMIC_L = 0; *pdwMIC_R = 0; - pDevice->bTxMICFail = FALSE; + pDevice->bTxMICFail = 0; } DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"uLength: %d, %d\n", uLength, cbFrameBodySize); @@ -3166,7 +3166,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un // Disable PS MACbPSWakeup(pDevice->PortOffset); } - pDevice->bPWBitOn = FALSE; + pDevice->bPWBitOn = 0; wmb(); pFrstTD->m_td0TD0.f1Owner = OWNED_BY_NIC; diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c index 01aab2c..a48d0e9 100644 --- a/drivers/staging/vt6655/srom.c +++ b/drivers/staging/vt6655/srom.c @@ -122,7 +122,7 @@ unsigned char SROMbyReadEmbedded(unsigned long dwIoBase, unsigned char byContntO * Out: * none * - * Return Value: 1 if succeeded; FALSE if failed. + * Return Value: 1 if succeeded; 0 if failed. * */ BOOL SROMbWriteEmbedded(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byData) @@ -157,7 +157,7 @@ BOOL SROMbWriteEmbedded(unsigned long dwIoBase, unsigned char byContntOffset, un } if (wNoACK == W_MAX_I2CRETRY) { VNSvOutPortB(dwIoBase + MAC_REG_I2MCFG, byOrg); - return FALSE; + return 0; } VNSvOutPortB(dwIoBase + MAC_REG_I2MCFG, byOrg); return 1; @@ -219,7 +219,7 @@ void SROMvRegBitsOff(unsigned long dwIoBase, unsigned char byContntOffset, unsig * Out: * none * - * Return Value: 1 if all test bits on; otherwise FALSE + * Return Value: 1 if all test bits on; otherwise 0 * */ BOOL SROMbIsRegBitsOn(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits) @@ -242,7 +242,7 @@ BOOL SROMbIsRegBitsOn(unsigned long dwIoBase, unsigned char byContntOffset, unsi * Out: * none * - * Return Value: 1 if all test bits off; otherwise FALSE + * Return Value: 1 if all test bits off; otherwise 0 * */ BOOL SROMbIsRegBitsOff(unsigned long dwIoBase, unsigned char byContntOffset, unsigned char byTestBits) @@ -386,7 +386,7 @@ void SROMvReadSubSysVenId(unsigned long dwIoBase, unsigned long *pdwSubSysVenId) * Out: * none * - * Return Value: 1 if success; otherwise FALSE + * Return Value: 1 if success; otherwise 0 * */ BOOL SROMbAutoLoad(unsigned long dwIoBase) @@ -413,7 +413,7 @@ BOOL SROMbAutoLoad(unsigned long dwIoBase) VNSvOutPortB(dwIoBase + MAC_REG_I2MCFG, byOrg); if (ii == EEP_MAX_CONTEXT_SIZE) - return FALSE; + return 0; return 1; } diff --git a/drivers/staging/vt6655/tether.c b/drivers/staging/vt6655/tether.c index cf18e1b..36ba27e 100644 --- a/drivers/staging/vt6655/tether.c +++ b/drivers/staging/vt6655/tether.c @@ -93,7 +93,7 @@ unsigned char ETHbyGetHashIndexByCrc32 (unsigned char *pbyMultiAddr) * Out: * none * - * Return Value: 1 if ok; FALSE if error. + * Return Value: 1 if ok; 0 if error. * */ BOOL ETHbIsBufferCrc32Ok (unsigned char *pbyBuffer, unsigned int cbFrameLength) @@ -102,7 +102,7 @@ BOOL ETHbIsBufferCrc32Ok (unsigned char *pbyBuffer, unsigned int cbFrameLength) dwCRC = CRCdwGetCrc32(pbyBuffer, cbFrameLength - 4); if (cpu_to_le32(*((unsigned long *)(pbyBuffer + cbFrameLength - 4))) != dwCRC) { - return FALSE; + return 0; } return 1; } diff --git a/drivers/staging/vt6655/ttype.h b/drivers/staging/vt6655/ttype.h index 67b30e0..2694793 100644 --- a/drivers/staging/vt6655/ttype.h +++ b/drivers/staging/vt6655/ttype.h @@ -39,10 +39,6 @@ typedef int BOOL; -#if !defined(FALSE) -#define FALSE 0 -#endif - //2007-0809-01<Add>by MikeLiu #ifndef update_BssList #define update_BssList diff --git a/drivers/staging/vt6655/vntwifi.c b/drivers/staging/vt6655/vntwifi.c index f253552..e74336b 100644 --- a/drivers/staging/vt6655/vntwifi.c +++ b/drivers/staging/vt6655/vntwifi.c @@ -319,7 +319,7 @@ VNTWIFIvSetAuthenticationMode ( (eAuthMode == WMAC_AUTH_AUTO)) { pMgmt->bShareKeyAlgorithm = 1; } else { - pMgmt->bShareKeyAlgorithm = FALSE; + pMgmt->bShareKeyAlgorithm = 0; } } @@ -352,7 +352,7 @@ VNTWIFIvSetEncryptionMode ( (eEncryptionMode == WMAC_ENCRYPTION_AESEnabled) ) { pMgmt->bPrivacyInvoked = 1; } else { - pMgmt->bPrivacyInvoked = FALSE; + pMgmt->bPrivacyInvoked = 0; } } @@ -371,7 +371,7 @@ VNTWIFIbConfigPhyMode ( if (CARDbSetPhyParameter(pMgmt->pAdapter, ePhyType, 0, 0, NULL, NULL) == 1) { pMgmt->eCurrentPHYMode = ePhyType; } else { - return(FALSE); + return 0; } } pMgmt->eConfigPHYMode = ePhyType; @@ -505,7 +505,7 @@ VNTWIFIvUpdateNodeTxCounter( if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) || (pMgmt->eCurrMode == WMAC_MODE_ESS_AP)) { - if (BSSDBbIsSTAInNodeDB(pMgmt, pbyDestAddress, &uNodeIndex) == FALSE) { + if (BSSDBbIsSTAInNodeDB(pMgmt, pbyDestAddress, &uNodeIndex) == 0) { return; } } @@ -628,7 +628,7 @@ VNTWIFIbInit( pMgmt = (PSMgmtObject)kmalloc(sizeof(SMgmtObject), (int)GFP_ATOMIC); if (pMgmt == NULL) { *pMgmtHandler = NULL; - return FALSE; + return 0; } memset(pMgmt, 0, sizeof(SMgmtObject)); @@ -648,8 +648,8 @@ VNTWIFIbInit( pMgmt->uCmdDequeueIdx = 0; pMgmt->uCmdEnqueueIdx = 0; pMgmt->eCommandState = WLAN_CMD_STATE_IDLE; - pMgmt->bCmdStop = FALSE; - pMgmt->bCmdRunning = FALSE; + pMgmt->bCmdStop = 0; + pMgmt->bCmdRunning = 0; *pMgmtHandler = pMgmt; return 1; @@ -668,7 +668,7 @@ VNTWIFIbSetPMKIDCache ( PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; if (ulCount > MAX_PMKID_CACHE) { - return (FALSE); + return 0; } pMgmt->gsPMKIDCache.BSSIDInfoCount = ulCount; memcpy(pMgmt->gsPMKIDCache.BSSIDInfo, pPMKIDInfo, (ulCount*sizeof(PMKIDInfo))); @@ -779,7 +779,7 @@ VNTWIFIbChannelSwitch( //spin_lock_irq(&pDevice->lock); pMgmt->uCurrChannel = byNewChannel; - pMgmt->bSwitchChannel = FALSE; + pMgmt->bSwitchChannel = 0; //spin_unlock_irq(&pDevice->lock); return 1; } diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c index 8a4eea8..36b7aa7 100644 --- a/drivers/staging/vt6655/wcmd.c +++ b/drivers/staging/vt6655/wcmd.c @@ -130,7 +130,7 @@ vAdHocBeaconStop(PSDevice pDevice) * or * (3.2) AdHoc channel is in A mode */ - bStop = FALSE; + bStop = 0; if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) && (pMgmt->eCurrState >= WMAC_STATE_STARTED)) { @@ -446,7 +446,7 @@ vCommandTimer ( } - if ((pMgmt->b11hEnable == FALSE) || + if ((pMgmt->b11hEnable == 0) || (pMgmt->uScanChannel < CB_MAX_CHANNEL_24G)) { s_vProbeChannel(pDevice); spin_unlock_irq(&pDevice->lock); @@ -499,14 +499,14 @@ vCommandTimer ( DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Send Disassociation Packet..\n"); // reason = 8 : disassoc because sta has left vMgrDisassocBeginSta((void *)pDevice, pMgmt, pMgmt->abyCurrBSSID, (8), &Status); - pDevice->bLinkPass = FALSE; + pDevice->bLinkPass = 0; // unlock command busy pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID; pItemSSID->len = 0; memset(pItemSSID->abySSID, 0, WLAN_SSID_MAXLEN); pMgmt->eCurrState = WMAC_STATE_IDLE; - pMgmt->sNodeDBTable[0].bActive = FALSE; -// pDevice->bBeaconBufReady = FALSE; + pMgmt->sNodeDBTable[0].bActive = 0; +// pDevice->bBeaconBufReady = 0; } netif_stop_queue(pDevice->dev); pDevice->eCommandState = WLAN_DISASSOCIATE_WAIT; @@ -570,7 +570,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS } netif_stop_queue(pDevice->dev); - pDevice->bLinkPass = FALSE; + pDevice->bLinkPass = 0; } // set initial state pMgmt->eCurrState = WMAC_STATE_IDLE; @@ -716,14 +716,14 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS netif_wake_queue(pDevice->dev); } #ifdef TxInSleep - if(pDevice->IsTxDataTrigger != FALSE) { //TxDataTimer is not triggered at the first time + if(pDevice->IsTxDataTrigger != 0) { //TxDataTimer is not triggered at the first time // printk("Re-initial TxDataTimer****\n"); del_timer(&pDevice->sTimerTxData); init_timer(&pDevice->sTimerTxData); pDevice->sTimerTxData.data = (unsigned long) pDevice; pDevice->sTimerTxData.function = (TimerFunction)BSSvSecondTxData; pDevice->sTimerTxData.expires = RUN_AT(10*HZ); //10s callback - pDevice->fTxDataInSleep = FALSE; + pDevice->fTxDataInSleep = 0; pDevice->nTxDataTimeCout = 0; } else { @@ -767,14 +767,14 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS del_timer(&pMgmt->sTimerSecondCallback); pMgmt->eCurrState = WMAC_STATE_IDLE; pMgmt->eCurrMode = WMAC_MODE_STANDBY; - pDevice->bLinkPass = FALSE; + pDevice->bLinkPass = 0; if (pDevice->bEnableHostWEP == 1) BSSvClearNodeDBTable(pDevice, 1); else BSSvClearNodeDBTable(pDevice, 0); pDevice->uAssocCount = 0; pMgmt->eCurrState = WMAC_STATE_IDLE; - pDevice->bFixRate = FALSE; + pDevice->bFixRate = 0; vMgrCreateOwnIBSS((void *)pDevice, &Status); if (Status != CMD_STATUS_SUCCESS){ @@ -800,7 +800,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[0].sTxPSQueue)) != NULL) { if (skb_queue_empty(&pMgmt->sNodeDBTable[0].sTxPSQueue)) { pMgmt->abyPSTxMap[0] &= ~byMask[0]; - pDevice->bMoreData = FALSE; + pDevice->bMoreData = 0; } else { pDevice->bMoreData = 1; @@ -823,7 +823,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS // clear tx map pMgmt->abyPSTxMap[pMgmt->sNodeDBTable[ii].wAID >> 3] &= ~byMask[pMgmt->sNodeDBTable[ii].wAID & 7]; - pDevice->bMoreData = FALSE; + pDevice->bMoreData = 0; } else { pDevice->bMoreData = 1; @@ -843,7 +843,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS ~byMask[pMgmt->sNodeDBTable[ii].wAID & 7]; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Index=%d PS queue clear \n", ii); } - pMgmt->sNodeDBTable[ii].bRxPSPoll = FALSE; + pMgmt->sNodeDBTable[ii].bRxPSPoll = 0; } } @@ -899,7 +899,7 @@ s_bCommandComplete ( ) { PWLAN_IE_SSID pSSID; - BOOL bRadioCmd = FALSE; + BOOL bRadioCmd = 0; //unsigned short wDeAuthenReason = 0; BOOL bForceSCAN = 1; PSMgmtObject pMgmt = pDevice->pMgmt; @@ -908,7 +908,7 @@ s_bCommandComplete ( pDevice->eCommandState = WLAN_CMD_IDLE; if (pDevice->cbFreeCmdQueue == CMD_Q_SIZE) { //Command Queue Empty - pDevice->bCmdRunning = FALSE; + pDevice->bCmdRunning = 0; return 1; } else { @@ -930,7 +930,7 @@ s_bCommandComplete ( memset(pMgmt->abyScanSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); } /* - if ((bForceSCAN == FALSE) && (pDevice->bLinkPass == 1)) { + if ((bForceSCAN == 0) && (pDevice->bLinkPass == 1)) { if ((pSSID->len == ((PWLAN_IE_SSID)pMgmt->abyCurrSSID)->len) && ( !memcmp(pSSID->abySSID, ((PWLAN_IE_SSID)pMgmt->abyCurrSSID)->abySSID, pSSID->len))) { pDevice->eCommandState = WLAN_CMD_IDLE; @@ -986,7 +986,7 @@ BOOL bScheduleCommand ( if (pDevice->cbFreeCmdQueue == 0) { - return (FALSE); + return 0; } pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].eCmd = eCommand; pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bForceSCAN = 1; @@ -998,7 +998,7 @@ BOOL bScheduleCommand ( case WLAN_CMD_BSSID_SCAN: memcpy(pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].abyCmdDesireSSID, pbyItem0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); - pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bForceSCAN = FALSE; + pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bForceSCAN = 0; break; case WLAN_CMD_SSID: @@ -1034,7 +1034,7 @@ BOOL bScheduleCommand ( ADD_ONE_WITH_WRAP_AROUND(pDevice->uCmdEnqueueIdx, CMD_Q_SIZE); pDevice->cbFreeCmdQueue--; - if (pDevice->bCmdRunning == FALSE) { + if (pDevice->bCmdRunning == 0) { s_bCommandComplete(pDevice); } else { @@ -1054,7 +1054,7 @@ BOOL bScheduleCommand ( * Out: * none * - * Return Value: 1 if success; otherwise FALSE + * Return Value: 1 if success; otherwise 0 * */ BOOL bClearBSSID_SCAN ( @@ -1096,8 +1096,8 @@ vResetCommandTimer( pDevice->uCmdDequeueIdx = 0; pDevice->uCmdEnqueueIdx = 0; pDevice->eCommandState = WLAN_CMD_IDLE; - pDevice->bCmdRunning = FALSE; - pDevice->bCmdClear = FALSE; + pDevice->bCmdRunning = 0; + pDevice->bCmdClear = 0; } @@ -1131,7 +1131,7 @@ BSSvSecondTxData( // printk("mike:%s-->InSleep Tx Data Procedure\n",__FUNCTION__); pDevice->fTxDataInSleep = 1; PSbSendNullPacket(pDevice); //send null packet - pDevice->fTxDataInSleep = FALSE; + pDevice->fTxDataInSleep = 0; } spin_unlock_irq(&pDevice->lock); diff --git a/drivers/staging/vt6655/wctl.c b/drivers/staging/vt6655/wctl.c index bb24d14..30c430f 100644 --- a/drivers/staging/vt6655/wctl.c +++ b/drivers/staging/vt6655/wctl.c @@ -53,7 +53,7 @@ /* * Description: * Scan Rx cache. Return 1 if packet is duplicate, else - * inserts in receive cache and returns FALSE. + * inserts in receive cache and returns 0. * * Parameters: * In: @@ -62,7 +62,7 @@ * Out: * none * - * Return Value: 1 if packet duplicate; otherwise FALSE + * Return Value: 1 if packet duplicate; otherwise 0 * */ @@ -91,7 +91,7 @@ BOOL WCTLbIsDuplicate (PSCache pCache, PS802_11Header pMACHeader) pCacheEntry->wFmSequence = pMACHeader->wSeqCtl; memcpy(&(pCacheEntry->abyAddr2[0]), &(pMACHeader->abyAddr2[0]), ETH_ALEN); ADD_ONE_WITH_WRAP_AROUND(pCache->uInPtr, DUPLICATE_RX_CACHE_LENGTH); - return FALSE; + return 0; } /* @@ -145,7 +145,7 @@ unsigned int ii; if (pDevice->cbFreeDFCB == 0) return(pDevice->cbDFCB); for(ii=0;ii<pDevice->cbDFCB;ii++) { - if (pDevice->sRxDFCB[ii].bInUse == FALSE) { + if (pDevice->sRxDFCB[ii].bInUse == 0) { pDevice->cbFreeDFCB--; pDevice->sRxDFCB[ii].uLifetime = pDevice->dwMaxReceiveLifetime; pDevice->sRxDFCB[ii].bInUse = 1; @@ -172,7 +172,7 @@ unsigned int ii; * Out: * none * - * Return Value: 1 if it is valid fragment packet and we have resource to defragment; otherwise FALSE + * Return Value: 1 if it is valid fragment packet and we have resource to defragment; otherwise 0 * */ BOOL WCTLbHandleFragment (PSDevice pDevice, PS802_11Header pMACHeader, unsigned int cbFrameLength, BOOL bWEP, BOOL bExtIV) @@ -201,7 +201,7 @@ unsigned int uHeaderSize; else { pDevice->uCurrentDFCBIdx = WCTLuInsertDFCB(pDevice, pMACHeader); if (pDevice->uCurrentDFCBIdx == pDevice->cbDFCB) { - return(FALSE); + return 0; } } // reserve 4 byte to match MAC RX Buffer @@ -211,7 +211,7 @@ unsigned int uHeaderSize; pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer += cbFrameLength; pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].wFragNum++; //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "First pDevice->uCurrentDFCBIdx= %d\n", pDevice->uCurrentDFCBIdx); - return(FALSE); + return 0; } else { pDevice->uCurrentDFCBIdx = WCTLuSearchDFCB(pDevice, pMACHeader); @@ -229,21 +229,21 @@ unsigned int uHeaderSize; else { // seq error or frag # error flush DFCB pDevice->cbFreeDFCB++; - pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].bInUse = FALSE; - return(FALSE); + pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].bInUse = 0; + return 0; } } else { - return(FALSE); + return 0; } if (IS_LAST_FRAGMENT_PKT(pMACHeader)) { //enq defragcontrolblock pDevice->cbFreeDFCB++; - pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].bInUse = FALSE; + pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].bInUse = 0; //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Last pDevice->uCurrentDFCBIdx= %d\n", pDevice->uCurrentDFCBIdx); return 1; } - return(FALSE); + return 0; } } diff --git a/drivers/staging/vt6655/wmgr.c b/drivers/staging/vt6655/wmgr.c index d4f0da4..280a023 100644 --- a/drivers/staging/vt6655/wmgr.c +++ b/drivers/staging/vt6655/wmgr.c @@ -369,7 +369,7 @@ vMgrObjectInit( pMgmt->byCSSPK = KEY_CTL_NONE; pMgmt->byCSSGK = KEY_CTL_NONE; pMgmt->wIBSSBeaconPeriod = DEFAULT_IBSS_BI; - BSSvClearBSSList((void *)pDevice, FALSE); + BSSvClearBSSList((void *)pDevice, 0); return; } @@ -408,8 +408,8 @@ vMgrTimerInit( pDevice->sTimerTxData.data = (unsigned long) pDevice; pDevice->sTimerTxData.function = (TimerFunction)BSSvSecondTxData; pDevice->sTimerTxData.expires = RUN_AT(10*HZ); //10s callback - pDevice->fTxDataInSleep = FALSE; - pDevice->IsTxDataTrigger = FALSE; + pDevice->fTxDataInSleep = 0; + pDevice->IsTxDataTrigger = 0; pDevice->nTxDataTimeCout = 0; #endif @@ -442,7 +442,7 @@ vMgrObjectReset( pMgmt->eCurrMode = WMAC_MODE_STANDBY; pMgmt->eCurrState = WMAC_STATE_IDLE; - pDevice->bEnablePSMode = FALSE; + pDevice->bEnablePSMode = 0; // TODO: timer return; @@ -718,7 +718,7 @@ s_vMgrRxAssocRequest( pMgmt->sNodeDBTable[uNodeIndex].wCapInfo = cpu_to_le16(*sFrame.pwCapInfo); pMgmt->sNodeDBTable[uNodeIndex].wListenInterval = cpu_to_le16(*sFrame.pwListenInterval); pMgmt->sNodeDBTable[uNodeIndex].bPSEnable = - WLAN_GET_FC_PWRMGT(sFrame.pHdr->sA3.wFrameCtl) ? 1 : FALSE; + WLAN_GET_FC_PWRMGT(sFrame.pHdr->sA3.wFrameCtl) ? 1 : 0; // Todo: check sta basic rate, if ap can't support, set status code if (pDevice->eCurrentPHYType == PHY_TYPE_11B) { uRateLen = WLAN_RATES_MAXLEN_11B; @@ -740,7 +740,7 @@ s_vMgrRxAssocRequest( RATEvParseMaxRate((void *)pDevice, (PWLAN_IE_SUPP_RATES)abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)abyCurrExtSuppRates, - FALSE, // do not change our basic rate + 0, // do not change our basic rate &(pMgmt->sNodeDBTable[uNodeIndex].wMaxBasicRate), &(pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate), &(pMgmt->sNodeDBTable[uNodeIndex].wSuppRate), @@ -771,7 +771,7 @@ s_vMgrRxAssocRequest( pDevice->bProtectMode = 1; pDevice->bNonERPPresent = 1; } - if (pMgmt->sNodeDBTable[uNodeIndex].bShortPreamble == FALSE) { + if (pMgmt->sNodeDBTable[uNodeIndex].bShortPreamble == 0) { pDevice->bBarkerPreambleMd = 1; } @@ -875,7 +875,7 @@ s_vMgrRxReAssocRequest( pMgmt->sNodeDBTable[uNodeIndex].wCapInfo = cpu_to_le16(*sFrame.pwCapInfo); pMgmt->sNodeDBTable[uNodeIndex].wListenInterval = cpu_to_le16(*sFrame.pwListenInterval); pMgmt->sNodeDBTable[uNodeIndex].bPSEnable = - WLAN_GET_FC_PWRMGT(sFrame.pHdr->sA3.wFrameCtl) ? 1 : FALSE; + WLAN_GET_FC_PWRMGT(sFrame.pHdr->sA3.wFrameCtl) ? 1 : 0; // Todo: check sta basic rate, if ap can't support, set status code if (pDevice->eCurrentPHYType == PHY_TYPE_11B) { @@ -899,7 +899,7 @@ s_vMgrRxReAssocRequest( RATEvParseMaxRate((void *)pDevice, (PWLAN_IE_SUPP_RATES)abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)abyCurrExtSuppRates, - FALSE, // do not change our basic rate + 0, // do not change our basic rate &(pMgmt->sNodeDBTable[uNodeIndex].wMaxBasicRate), &(pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate), &(pMgmt->sNodeDBTable[uNodeIndex].wSuppRate), @@ -931,7 +931,7 @@ s_vMgrRxReAssocRequest( pDevice->bProtectMode = 1; pDevice->bNonERPPresent = 1; } - if (pMgmt->sNodeDBTable[uNodeIndex].bShortPreamble == FALSE) { + if (pMgmt->sNodeDBTable[uNodeIndex].bShortPreamble == 0) { pDevice->bBarkerPreambleMd = 1; } @@ -1129,7 +1129,7 @@ s_vMgrRxAssocResponse( //need clear flags related to Networkmanager pDevice->bwextcount = 0; - pDevice->bWPASuppWextEnabled = FALSE; + pDevice->bWPASuppWextEnabled = 0; #endif @@ -1772,11 +1772,11 @@ s_vMgrRxDeauthentication( // TODO: update BSS list for specific BSSID if pre-authentication case if (!compare_ether_addr(sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID)) { if (pMgmt->eCurrState >= WMAC_STATE_AUTHPENDING) { - pMgmt->sNodeDBTable[0].bActive = FALSE; + pMgmt->sNodeDBTable[0].bActive = 0; pMgmt->eCurrMode = WMAC_MODE_STANDBY; pMgmt->eCurrState = WMAC_STATE_IDLE; netif_stop_queue(pDevice->dev); - pDevice->bLinkPass = FALSE; + pDevice->bLinkPass = 0; } }; @@ -1832,7 +1832,7 @@ ChannelExceedZoneType( unsigned char byCurrChannel ) { - BOOL exceed=FALSE; + BOOL exceed = 0; switch(pDevice->byZoneType) { case 0x00: //USA:1~11 @@ -1876,13 +1876,13 @@ s_vMgrRxBeacon( PKnownBSS pBSSList; WLAN_FR_BEACON sFrame; QWORD qwTSFOffset; - BOOL bIsBSSIDEqual = FALSE; - BOOL bIsSSIDEqual = FALSE; - BOOL bTSFLargeDiff = FALSE; - BOOL bTSFOffsetPostive = FALSE; - BOOL bUpdateTSF = FALSE; - BOOL bIsAPBeacon = FALSE; - BOOL bIsChannelEqual = FALSE; + BOOL bIsBSSIDEqual = 0; + BOOL bIsSSIDEqual = 0; + BOOL bTSFLargeDiff = 0; + BOOL bTSFOffsetPostive = 0; + BOOL bUpdateTSF = 0; + BOOL bIsAPBeacon = 0; + BOOL bIsChannelEqual = 0; unsigned int uLocateByteIndex; unsigned char byTIMBitOn = 0; unsigned short wAIDNumber = 0; @@ -1894,8 +1894,8 @@ s_vMgrRxBeacon( unsigned char byCurrChannel = pRxPacket->byRxChannel; ERPObject sERP; unsigned int uRateLen = WLAN_RATES_MAXLEN; - BOOL bChannelHit = FALSE; - BOOL bUpdatePhyParameter = FALSE; + BOOL bChannelHit = 0; + BOOL bUpdatePhyParameter = 0; unsigned char byIEChannel = 0; @@ -1924,7 +1924,7 @@ s_vMgrRxBeacon( } if (byCurrChannel != byIEChannel) { // adjust channel info. bcs we rcv adjcent channel pakckets - bChannelHit = FALSE; + bChannelHit = 0; byCurrChannel = byIEChannel; } } else { @@ -1940,7 +1940,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel) == 1) sERP.bERPExist = 1; } else { - sERP.bERPExist = FALSE; + sERP.bERPExist = 0; sERP.byERP = 0; } @@ -2127,7 +2127,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel) == 1) sFrame.pIE_CHSW->byCount ); - } else if (bIsChannelEqual == FALSE) { + } else if (bIsChannelEqual == 0) { set_channel(pMgmt->pAdapter, pBSSList->uChannel); } } @@ -2152,14 +2152,14 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel) == 1) bTSFOffsetPostive = 1; } else { - bTSFOffsetPostive = FALSE; + bTSFOffsetPostive = 0; } } else if (HIDWORD(qwTimestamp) > HIDWORD(qwLocalTSF)) { bTSFOffsetPostive = 1; } else if (HIDWORD(qwTimestamp) < HIDWORD(qwLocalTSF)) { - bTSFOffsetPostive = FALSE; + bTSFOffsetPostive = 0; }; if (bTSFOffsetPostive) { @@ -2185,7 +2185,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel) == 1) if ((pDevice->bEnablePSMode == 1) &&(sFrame.pTIM != 0)) { // deal with DTIM, analysis TIM - pMgmt->bMulticastTIM = WLAN_MGMT_IS_MULTICAST_TIM(sFrame.pTIM->byBitMapCtl) ? 1 : FALSE ; + pMgmt->bMulticastTIM = WLAN_MGMT_IS_MULTICAST_TIM(sFrame.pTIM->byBitMapCtl) ? 1 : 0; pMgmt->byDTIMCount = sFrame.pTIM->byDTIMCount; pMgmt->byDTIMPeriod = sFrame.pTIM->byDTIMPeriod; wAIDNumber = pMgmt->wCurrAID & ~(BIT14|BIT15); @@ -2200,14 +2200,14 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel) == 1) // len = byDTIMCount + byDTIMPeriod + byDTIMPeriod + byVirtBitMap[0~250] if (sFrame.pTIM->len >= (uLocateByteIndex + 4)) { byTIMBitOn = (0x01) << ((wAIDNumber) % 8); - pMgmt->bInTIM = sFrame.pTIM->byVirtBitMap[uLocateByteIndex] & byTIMBitOn ? 1 : FALSE; + pMgmt->bInTIM = sFrame.pTIM->byVirtBitMap[uLocateByteIndex] & byTIMBitOn ? 1 : 0; } else { - pMgmt->bInTIM = FALSE; + pMgmt->bInTIM = 0; }; } else { - pMgmt->bInTIM = FALSE; + pMgmt->bInTIM = 0; }; if (pMgmt->bInTIM || @@ -2222,14 +2222,14 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel) == 1) } else { - pMgmt->bInTIMWake = FALSE; + pMgmt->bInTIMWake = 0; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN: Not In TIM..\n"); - if (pDevice->bPWBitOn == FALSE) { + if (pDevice->bPWBitOn == 0) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN: Send Null Packet\n"); if (PSbSendNullPacket(pDevice)) pDevice->bPWBitOn = 1; } - if(PSbConsiderPowerDown(pDevice, FALSE, FALSE)) { + if(PSbConsiderPowerDown(pDevice, 0, 0)) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN: Power down now...\n"); }; } @@ -2709,14 +2709,14 @@ vMgrJoinBSSBegin( // patch for CISCO migration mode /* if (pDevice->eEncryptionStatus == Ndis802_11Encryption2Enabled) { - if (WPA_SearchRSN(0, WPA_TKIP, pCurr) == FALSE) { + if (WPA_SearchRSN(0, WPA_TKIP, pCurr) == 0) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"No match RSN info. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n"); // encryption mode error pMgmt->eCurrState = WMAC_STATE_IDLE; return; } } else if (pDevice->eEncryptionStatus == Ndis802_11Encryption3Enabled) { - if (WPA_SearchRSN(0, WPA_AESCCMP, pCurr) == FALSE) { + if (WPA_SearchRSN(0, WPA_AESCCMP, pCurr) == 0) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"No match RSN info. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n"); // encryption mode error pMgmt->eCurrState = WMAC_STATE_IDLE; @@ -2805,7 +2805,7 @@ vMgrJoinBSSBegin( if (pMgmt->eAuthenMode == WMAC_AUTH_WPA2) { BOOL bResult = bAdd_PMKID_Candidate((void *)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate: 1(%d)\n", bResult); - if (bResult == FALSE) { + if (bResult == 0) { vFlush_PMKID_Candidate((void *)pDevice); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFlush_PMKID_Candidate: 4\n"); bAdd_PMKID_Candidate((void *)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj); @@ -2832,13 +2832,13 @@ vMgrJoinBSSBegin( if (pMgmt->eAuthenMode == WMAC_AUTH_WPANONE) { if (pDevice->eEncryptionStatus == Ndis802_11Encryption2Enabled) { - if (WPA_SearchRSN(0, WPA_TKIP, pCurr) == FALSE) { + if (WPA_SearchRSN(0, WPA_TKIP, pCurr) == 0) { // encryption mode error pMgmt->eCurrState = WMAC_STATE_IDLE; return; } } else if (pDevice->eEncryptionStatus == Ndis802_11Encryption3Enabled) { - if (WPA_SearchRSN(0, WPA_AESCCMP, pCurr) == FALSE) { + if (WPA_SearchRSN(0, WPA_AESCCMP, pCurr) == 0) { // encryption mode error pMgmt->eCurrState = WMAC_STATE_IDLE; return; @@ -2945,7 +2945,7 @@ s_vMgrSynchBSS ( if (s_bCipherMatch(pCurr, pDevice->eEncryptionStatus, &(pMgmt->byCSSPK), - &(pMgmt->byCSSGK)) == FALSE) { + &(pMgmt->byCSSGK)) == 0) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "s_bCipherMatch Fail .......\n"); return; } @@ -2960,11 +2960,11 @@ s_vMgrSynchBSS ( // Init the BSS informations pDevice->bCCK = 1; - pDevice->bProtectMode = FALSE; + pDevice->bProtectMode = 0; MACvDisableProtectMD(pDevice->PortOffset); - pDevice->bBarkerPreambleMd = FALSE; + pDevice->bBarkerPreambleMd = 0; MACvDisableBarkerPreambleMd(pDevice->PortOffset); - pDevice->bNonERPPresent = FALSE; + pDevice->bNonERPPresent = 0; pDevice->byPreambleType = 0; pDevice->wBasicRate = 0; // Set Basic Rate @@ -3052,7 +3052,7 @@ s_vMgrSynchBSS ( return; } // set channel and clear NAV - if (set_channel(pMgmt->pAdapter, pCurr->uChannel) == FALSE) { + if (set_channel(pMgmt->pAdapter, pCurr->uChannel) == 0) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "<----s_bSynchBSS Set Channel [%d]\n", pCurr->uChannel); return; } @@ -3155,8 +3155,8 @@ s_vMgrFormatTIM( unsigned char byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; unsigned char byMap; unsigned int ii, jj; - BOOL bStartFound = FALSE; - BOOL bMulticast = FALSE; + BOOL bStartFound = 0; + BOOL bMulticast = 0; unsigned short wStartIndex = 0; unsigned short wEndIndex = 0; @@ -4357,7 +4357,7 @@ s_vMgrRxProbeResponse( } if (byCurrChannel != byIEChannel) { // adjust channel info. bcs we rcv adjcent channel pakckets - bChannelHit = FALSE; + bChannelHit = 0; byCurrChannel = byIEChannel; } } else { @@ -4373,7 +4373,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel) == 1) sERP.byERP = sFrame.pERP->byContext; sERP.bERPExist = 1; } else { - sERP.bERPExist = FALSE; + sERP.bERPExist = 0; sERP.byERP = 0; } @@ -4543,7 +4543,7 @@ vMgrRxManagePacket( ) { PSDevice pDevice = (PSDevice)hDeviceContext; - BOOL bInScan = FALSE; + BOOL bInScan = 0; unsigned int uNodeIndex = 0; NODE_STATE eNodeState = 0; CMD_STATUS Status; @@ -4578,7 +4578,7 @@ vMgrRxManagePacket( case WLAN_FSTYPE_ASSOCRESP: // Frame Clase = 2 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx assocresp1\n"); - s_vMgrRxAssocResponse(pDevice, pMgmt, pRxPacket, FALSE); + s_vMgrRxAssocResponse(pDevice, pMgmt, pRxPacket, 0); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx assocresp2\n"); break; @@ -4681,7 +4681,7 @@ vMgrRxManagePacket( * Prepare beacon to send * * Return Value: - * 1 if success; FALSE if failed. + * 1 if success; 0 if failed. * -*/ BOOL @@ -4693,7 +4693,7 @@ bMgrPrepareBeaconToSend( PSDevice pDevice = (PSDevice)hDeviceContext; PSTxMgmtPacket pTxPacket; -// pDevice->bBeaconBufReady = FALSE; +// pDevice->bBeaconBufReady = 0; if (pDevice->bEncryptionEnable || pDevice->bEnable8021x){ pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_PRIVACY(1); } @@ -4716,7 +4716,7 @@ bMgrPrepareBeaconToSend( if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) && (pMgmt->abyCurrBSSID[0] == 0)) - return FALSE; + return 0; csBeacon_xmit(pDevice, pTxPacket); @@ -4822,10 +4822,10 @@ bAdd_PMKID_Candidate ( DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate START: (%d)\n", (int)pDevice->gsPMKIDCandidate.NumCandidates); if ((pDevice == NULL) || (pbyBSSID == NULL) || (psRSNCapObj == NULL)) - return FALSE; + return 0; if (pDevice->gsPMKIDCandidate.NumCandidates >= MAX_PMKIDLIST) - return FALSE; + return 0; @@ -4895,7 +4895,7 @@ s_bCipherMatch ( int i; if (pBSSNode == NULL) - return FALSE; + return 0; // check cap. of BSS if ((WLAN_GET_CAP_INFO_PRIVACY(pBSSNode->wCapInfo) != 0) && @@ -4981,7 +4981,7 @@ s_bCipherMatch ( *pbyCCSPK = KEY_CTL_NONE; return 1; } else { - return FALSE; + return 0; } } else if (EncStatus == Ndis802_11Encryption2Enabled) { @@ -5001,13 +5001,13 @@ s_bCipherMatch ( *pbyCCSPK = KEY_CTL_TKIP; return 1; } else { - return FALSE; + return 0; } } else if (EncStatus == Ndis802_11Encryption3Enabled) { if ((byMulticastCipher == KEY_CTL_CCMP) && (byCipherMask == 0)) { // When CCMP is enable, "Use group cipher suite" shall not be a valid option. - return FALSE; + return 0; } else if ((byMulticastCipher == KEY_CTL_WEP) && ((byCipherMask & 0x04) != 0)) { *pbyCCSGK = KEY_CTL_WEP; @@ -5024,7 +5024,7 @@ s_bCipherMatch ( *pbyCCSPK = KEY_CTL_CCMP; return 1; } else { - return FALSE; + return 0; } } return 1; diff --git a/drivers/staging/vt6655/wpa.c b/drivers/staging/vt6655/wpa.c index ca00791..58eab08 100644 --- a/drivers/staging/vt6655/wpa.c +++ b/drivers/staging/vt6655/wpa.c @@ -83,9 +83,9 @@ WPA_ClearRSN ( pBSSList->wAuthCount = 0; pBSSList->byDefaultK_as_PK = 0; pBSSList->byReplayIdx = 0; - pBSSList->sRSNCapObj.bRSNCapExist = FALSE; + pBSSList->sRSNCapObj.bRSNCapExist = 0; pBSSList->sRSNCapObj.wRSNCap = 0; - pBSSList->bWPAValid = FALSE; + pBSSList->bWPAValid = 0; } @@ -247,14 +247,14 @@ WPA_SearchRSN ( int ii; unsigned char byPKType = WPA_NONE; - if (pBSSList->bWPAValid == FALSE) - return FALSE; + if (pBSSList->bWPAValid == 0) + return 0; switch(byCmd) { case 0: if (byEncrypt != pBSSList->byGKType) - return FALSE; + return 0; if (pBSSList->wPKCount > 0) { for (ii = 0; ii < pBSSList->wPKCount; ii ++) { @@ -268,7 +268,7 @@ WPA_SearchRSN ( byPKType = WPA_WEP104; } if (byEncrypt != byPKType) - return FALSE; + return 0; } return 1; // if (pBSSList->wAuthCount > 0) @@ -280,7 +280,7 @@ WPA_SearchRSN ( default: break; } - return FALSE; + return 0; } /*+ @@ -303,7 +303,7 @@ WPAb_Is_RSN ( ) { if (pRSN == NULL) - return FALSE; + return 0; if ((pRSN->len >= 6) && // oui1(4)+ver(2) (pRSN->byElementID == WLAN_EID_RSN_WPA) && !memcmp(pRSN->abyOUI, abyOUI01, 4) && @@ -311,6 +311,6 @@ WPAb_Is_RSN ( return 1; } else - return FALSE; + return 0; } diff --git a/drivers/staging/vt6655/wpa2.c b/drivers/staging/vt6655/wpa2.c index 5f43017..292a7e2 100644 --- a/drivers/staging/vt6655/wpa2.c +++ b/drivers/staging/vt6655/wpa2.c @@ -79,7 +79,7 @@ WPA2_ClearRSN ( { int ii; - pBSSNode->bWPA2Valid = FALSE; + pBSSNode->bWPA2Valid = 0; pBSSNode->byCSSGK = WLAN_11i_CSS_CCMP; for (ii=0; ii < 4; ii ++) @@ -88,7 +88,7 @@ WPA2_ClearRSN ( for (ii=0; ii < 4; ii ++) pBSSNode->abyAKMSSAuthType[ii] = WLAN_11i_AKMSS_802_1X; pBSSNode->wAKMSSAuthCount = 1; - pBSSNode->sRSNCapObj.bRSNCapExist = FALSE; + pBSSNode->sRSNCapObj.bRSNCapExist = 0; pBSSNode->sRSNCapObj.wRSNCap = 0; } @@ -116,7 +116,7 @@ WPA2vParseRSN ( int i, j; unsigned short m = 0, n = 0; unsigned char *pbyOUI; - BOOL bUseGK = FALSE; + BOOL bUseGK = 0; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"WPA2_ParseRSN: [%d]\n", pRSN->len); diff --git a/drivers/staging/vt6655/wpactl.c b/drivers/staging/vt6655/wpactl.c index 2698a0a..f2a7bda 100644 --- a/drivers/staging/vt6655/wpactl.c +++ b/drivers/staging/vt6655/wpactl.c @@ -219,9 +219,9 @@ int wpa_set_wpadev(PSDevice pDevice, int val) DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "param->u.wpa_key.alg_name = %d \n", param->u.wpa_key.alg_name); if (param->u.wpa_key.alg_name == WPA_ALG_NONE) { pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled; - pDevice->bEncryptionEnable = FALSE; + pDevice->bEncryptionEnable = 0; pDevice->byKeyIndex = 0; - pDevice->bTransmitKey = FALSE; + pDevice->bTransmitKey = 0; KeyvRemoveAllWEPKey(&(pDevice->sKey), pDevice->PortOffset); for (uu=0; uu<MAX_KEY_TABLE; uu++) { MACvDisableKeyEntry(pDevice->PortOffset, uu); @@ -465,7 +465,7 @@ static int wpa_set_wpa(PSDevice pDevice, int ret = 0; pMgmt->eAuthenMode = WMAC_AUTH_OPEN; - pMgmt->bShareKeyAlgorithm = FALSE; + pMgmt->bShareKeyAlgorithm = 0; return ret; } @@ -641,7 +641,7 @@ static int wpa_get_scan(PSDevice pDevice, if((pMgmt->sBSSList[jj].bActive != 1) || - ((pMgmt->sBSSList[jj].uRSSI>pMgmt->sBSSList[jj+1].uRSSI) &&(pMgmt->sBSSList[jj+1].bActive!=FALSE))) { + ((pMgmt->sBSSList[jj].uRSSI>pMgmt->sBSSList[jj+1].uRSSI) && (pMgmt->sBSSList[jj+1].bActive != 0))) { memcpy(ptempBSS,&pMgmt->sBSSList[jj],sizeof(KnownBSS)); @@ -755,7 +755,7 @@ static int wpa_set_associate(PSDevice pDevice, unsigned char abyNullAddr[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; unsigned char abyWPAIE[64]; int ret = 0; - BOOL bWepEnabled=FALSE; + BOOL bWepEnabled = 0; // set key type & algorithm DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pairwise_suite = %d\n", param->u.wpa_associate.pairwise_suite); @@ -840,7 +840,7 @@ else if(!bWepEnabled) pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled; else pDevice->eEncryptionStatus = Ndis802_11Encryption1Enabled; //pMgmt->eAuthenMode = WMAC_AUTH_OPEN; - //pMgmt->bShareKeyAlgorithm = FALSE; //20080717-06,<Modify> by chester//Fix Open mode, WEP encrytion + //pMgmt->bShareKeyAlgorithm = 0; //20080717-06,<Modify> by chester//Fix Open mode, WEP encrytion } //mike save old encryption status pDevice->eOldEncryptionStatus = pDevice->eEncryptionStatus; @@ -848,12 +848,12 @@ else if (pDevice->eEncryptionStatus != Ndis802_11EncryptionDisabled) pDevice->bEncryptionEnable = 1; else - pDevice->bEncryptionEnable = FALSE; + pDevice->bEncryptionEnable = 0; if (!((pMgmt->eAuthenMode == WMAC_AUTH_SHAREKEY) || ((pMgmt->eAuthenMode == WMAC_AUTH_OPEN) && (bWepEnabled == 1))) ) //DavidWang //20080717-06,<Modify> by chester//Not to initial WEP KeyvInitTable(&pDevice->sKey, pDevice->PortOffset); spin_lock_irq(&pDevice->lock); - pDevice->bLinkPass = FALSE; + pDevice->bLinkPass = 0; memset(pMgmt->abyCurrBSSID, 0, 6); pMgmt->eCurrState = WMAC_STATE_IDLE; netif_stop_queue(pDevice->dev); @@ -922,7 +922,7 @@ int wpa_ioctl(PSDevice pDevice, struct iw_point *p) case VIAWGET_SET_KEY: DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_KEY \n"); spin_lock_irq(&pDevice->lock); - ret = wpa_set_keys(pDevice, param, FALSE); + ret = wpa_set_keys(pDevice, param, 0); spin_unlock_irq(&pDevice->lock); break; diff --git a/drivers/staging/vt6655/wroute.c b/drivers/staging/vt6655/wroute.c index c6008c5..e6442dc 100644 --- a/drivers/staging/vt6655/wroute.c +++ b/drivers/staging/vt6655/wroute.c @@ -60,9 +60,9 @@ static int msglevel =MSG_LEVEL_INFO; * pDevice - * pbySkbData - rx packet skb data * Out: - * TURE, FALSE + * 1, 0 * - * Return Value: 1 if packet duplicate; otherwise FALSE + * Return Value: 1 if packet duplicate; otherwise 0 * */ BOOL ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDataLen, unsigned int uNodeIndex) @@ -72,7 +72,7 @@ BOOL ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDat unsigned int cbFrameBodySize; unsigned int uMACfragNum; unsigned char byPktType; - BOOL bNeedEncryption = FALSE; + BOOL bNeedEncryption = 0; SKeyItem STempKey; PSKeyItem pTransmitKey = NULL; unsigned int cbHeaderSize; @@ -84,7 +84,7 @@ BOOL ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDat if (AVAIL_TD(pDevice, TYPE_AC0DMA)<=0) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Relay can't allocate TD1..\n"); - return FALSE; + return 0; } pHeadTD = pDevice->apCurrTD[TYPE_AC0DMA]; @@ -104,7 +104,7 @@ BOOL ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDat // get group key pbyBSSID = pDevice->abyBroadcastAddr; - if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == FALSE) { + if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == 0) { pTransmitKey = NULL; DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"KEY is NULL. [%d]\n", pDevice->pMgmt->eCurrMode); } else { @@ -130,7 +130,7 @@ BOOL ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDat uMACfragNum = cbGetFragCount(pDevice, pTransmitKey, cbFrameBodySize, &pDevice->sTxEthHeader); if (uMACfragNum > AVAIL_TD(pDevice,TYPE_AC0DMA)) { - return FALSE; + return 0; } byPktType = (unsigned char)pDevice->byPacketType; @@ -172,7 +172,7 @@ BOOL ROUTEbRelay (PSDevice pDevice, unsigned char *pbySkbData, unsigned int uDat MACbPSWakeup(pDevice->PortOffset); } - pDevice->bPWBitOn = FALSE; + pDevice->bPWBitOn = 0; pLastTD = pHeadTD; for (ii = 0; ii < uMACfragNum; ii++) { -- 1.7.1.1 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel