staging: vt6655: delete explicit comparison to bool

This patch fixes the following type of coccinelle detected warnings for
driver vt6655:

WARNING: Comparison to bool

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c
index 959568a1eb6a03da7260685acec030f8ccebeebf..fa14659ba43cf49a2950593813eb033e61fd646e 100644 (file)
--- a/drivers/staging/vt6655/baseband.c
+++ b/drivers/staging/vt6655/baseband.c
@@ -1865,7 +1865,7 @@ BBvCalculateParameter(
                break;
 
        case RATE_5M:
-               if (bCCK == false)
+               if (!bCCK)
                        cbBitCount++;
                cbUsCount = (cbBitCount * 10) / 55;
                cbTmp = (cbUsCount * 55) / 10;
@@ -1879,7 +1879,7 @@ BBvCalculateParameter(
 
        case RATE_11M:
 
-               if (bCCK == false)
+               if (!bCCK)
                        cbBitCount++;
                cbUsCount = cbBitCount / 11;
                cbTmp = cbUsCount * 11;

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index fbf18e23e78ecb3230cbf45787f3bf91bcc6610b..e95ecca549f7e9bee059cf8fc918b944911e7278 100644 (file)
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -1053,7 +1053,7 @@ CARDbAdd_PMKID_Candidate(
        for (ii = 0; ii < pDevice->gsPMKIDCandidate.NumCandidates; ii++) {
                pCandidateList = &pDevice->gsPMKIDCandidate.CandidateList[ii];
                if (!memcmp(pCandidateList->BSSID, pbyBSSID, ETH_ALEN)) {
-                       if ((bRSNCapExist == true) && (wRSNCap & BIT0)) {
+                       if (bRSNCapExist && (wRSNCap & BIT0)) {
                                pCandidateList->Flags |= NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED;
                        } else {
                                pCandidateList->Flags &= ~(NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED);
@@ -1064,7 +1064,7 @@ CARDbAdd_PMKID_Candidate(
 
        // New Candidate
        pCandidateList = &pDevice->gsPMKIDCandidate.CandidateList[pDevice->gsPMKIDCandidate.NumCandidates];
-       if ((bRSNCapExist == true) && (wRSNCap & BIT0)) {
+       if (bRSNCapExist && (wRSNCap & BIT0)) {
                pCandidateList->Flags |= NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED;
        } else {
                pCandidateList->Flags &= ~(NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED);
@@ -1190,7 +1190,7 @@ CARDbStartMeasure(
                }
        } while (pDevice->uNumOfMeasureEIDs != 0);
 
-       if (bExpired == false) {
+       if (!bExpired) {
                MACvSelectPage1(pDevice->PortOffset);
                VNSvOutPortD(pDevice->PortOffset + MAC_REG_MSRSTART, LODWORD(qwStartTSF));
                VNSvOutPortD(pDevice->PortOffset + MAC_REG_MSRSTART + 4, HIDWORD(qwStartTSF));
@@ -1280,7 +1280,7 @@ CARDbSetQuiet(
        PSDevice    pDevice = (PSDevice) pDeviceHandler;
        unsigned int ii = 0;
 
-       if (bResetQuiet == true) {
+       if (bResetQuiet) {
                MACvRegBitsOff(pDevice->PortOffset, MAC_REG_MSRCTL, (MSRCTL_QUIETTXCHK | MSRCTL_QUIETEN));
                for (ii = 0; ii < MAX_QUIET_COUNT; ii++) {
                        pDevice->sQuiet[ii].bEnable = false;

diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c
index ba9481fa654f137e0b6dd54e746174ad6cc2ac70..3198a31e2ed7a3726e091e303e2ec6a2fdab1043 100644 (file)
--- a/drivers/staging/vt6655/channel.c
+++ b/drivers/staging/vt6655/channel.c
@@ -441,8 +441,8 @@ void init_channel_table(void *pDeviceHandler)
                break;
        }
 
-       if ((pDevice->dwDiagRefCount != 0) || (pDevice->b11hEnable == true)) {
-               if (bMultiBand == true) {
+       if ((pDevice->dwDiagRefCount != 0) || pDevice->b11hEnable) {
+               if (bMultiBand) {
                        for (ii = 0; ii < CARD_MAX_CHANNEL_TBL; ii++) {
                                sChannelTbl[ii + 1].bValid = true;
                                pDevice->abyRegPwr[ii + 1] = pDevice->abyOFDMDefaultPwr[ii + 1];
@@ -463,7 +463,7 @@ void init_channel_table(void *pDeviceHandler)
                        }
                }
        } else if (pDevice->byZoneType <= CCODE_MAX) {
-               if (bMultiBand == true) {
+               if (bMultiBand) {
                        for (ii = 0; ii < CARD_MAX_CHANNEL_TBL; ii++) {
                                if (ChannelRuleTab[pDevice->byZoneType].bChannelIdxList[ii] != 0) {
                                        sChannelTbl[ii + 1].bValid = true;
@@ -531,7 +531,7 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel)
                return bResult;
        }
 
-       if (sChannelTbl[uConnectionChannel].bValid == false) {
+       if (!sChannelTbl[uConnectionChannel].bValid) {
                return false;
        }
 
@@ -557,7 +557,7 @@ bool set_channel(void *pDeviceHandler, unsigned int uConnectionChannel)
        bResult &= RFbSelectChannel(pDevice->PortOffset, pDevice->byRFType, (unsigned char)uConnectionChannel);
 
        // Init Synthesizer Table
-       if (pDevice->bEnablePSMode == true)
+       if (pDevice->bEnablePSMode)
                RFvWriteWakeProgSyn(pDevice->PortOffset, pDevice->byRFType, uConnectionChannel);
 
        //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "CARDbSetMediaChannel: %d\n", (unsigned char)uConnectionChannel);
@@ -766,7 +766,7 @@ unsigned char auto_channel_select(void *pDeviceHandler, CARD_PHY_TYPE ePHYType)
 
        if (ePHYType == PHY_TYPE_11A) {
                for (ii = CB_MAX_CHANNEL_24G + 1; ii <= CB_MAX_CHANNEL; ii++) {
-                       if (sChannelTbl[ii].bValid == true) {
+                       if (sChannelTbl[ii].bValid) {
                                if (byOptionChannel == 0) {
                                        byOptionChannel = (unsigned char) ii;
                                }
@@ -780,7 +780,7 @@ unsigned char auto_channel_select(void *pDeviceHandler, CARD_PHY_TYPE ePHYType)
        } else {
                byOptionChannel = 0;
                for (ii = 1; ii <= CB_MAX_CHANNEL_24G; ii++) {
-                       if (sChannelTbl[ii].bValid == true) {
+                       if (sChannelTbl[ii].bValid) {
                                if (sChannelTbl[ii].byMAP == 0) {
                                        aiWeight[ii] += 100;
                                } else if (sChannelTbl[ii].byMAP & 0x01) {
@@ -807,7 +807,7 @@ unsigned char auto_channel_select(void *pDeviceHandler, CARD_PHY_TYPE ePHYType)
                        }
                }
                for (ii = 1; ii <= CB_MAX_CHANNEL_24G; ii++) {
-                       if ((sChannelTbl[ii].bValid == true) &&
+                       if (sChannelTbl[ii].bValid &&
                            (aiWeight[ii] > aiWeight[byOptionChannel])) {
                                byOptionChannel = (unsigned char) ii;
                        }

diff --git a/drivers/staging/vt6655/datarate.c b/drivers/staging/vt6655/datarate.c
index e7b6bc7de4ac20ffa233293e7278c815356c27fc..c9a89cd7633cfacfe6594d33e9d86cad8fff92f4 100644 (file)
--- a/drivers/staging/vt6655/datarate.c
+++ b/drivers/staging/vt6655/datarate.c
@@ -218,8 +218,7 @@ RATEvParseMaxRate(
 
        for (ii = 0; ii < uRateLen; ii++) {
                byRate = (unsigned char)(pItemRates->abyRates[ii]);
-               if (WLAN_MGMT_IS_BASICRATE(byRate) &&
-                   (bUpdateBasicRate == true))  {
+               if (WLAN_MGMT_IS_BASICRATE(byRate) && bUpdateBasicRate)  {
                        // Add to basic rate set, update pDevice->byTopCCKBasicRate and pDevice->byTopOFDMBasicRate
                        CARDbAddBasicRate((void *)pDevice, wGetRateIdx(byRate));
                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ParseMaxRate AddBasicRate: %d\n", wGetRateIdx(byRate));
@@ -329,7 +328,7 @@ RATEvTxRateFallBack(
 
        for (ii = 0; ii < MAX_RATE; ii++) {
                if (psNodeDBTable->wSuppRate & (0x0001<<ii)) {
-                       if (bAutoRate[ii] == true) {
+                       if (bAutoRate[ii]) {
                                wIdxUpRate = (unsigned short) ii;
                        }
                } else {
@@ -354,8 +353,7 @@ RATEvTxRateFallBack(
        wIdxDownRate = psNodeDBTable->wTxDataRate;
        for (ii = psNodeDBTable->wTxDataRate; ii > 0;) {
                ii--;
-               if ((dwThroughputTbl[ii] > dwThroughput) &&
-                   (bAutoRate[ii] == true)) {
+               if ((dwThroughputTbl[ii] > dwThroughput) && bAutoRate[ii]) {
                        dwThroughput = dwThroughputTbl[ii];
                        wIdxDownRate = (unsigned short) ii;
                }

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index e93fdc88d84456ed52a8cb6cdaf9c02289c695c2..68cbaee2977518670a7bf608cfe889cf18fb40e6 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -561,7 +561,7 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
                        pDevice->byTxAntennaMode = ANT_B;
                        pDevice->dwTxAntennaSel = 1;
                        pDevice->dwRxAntennaSel = 1;
-                       if (pDevice->bTxRxAntInv == true)
+                       if (pDevice->bTxRxAntInv)
                                pDevice->byRxAntennaMode = ANT_A;
                        else
                                pDevice->byRxAntennaMode = ANT_B;
@@ -578,13 +578,13 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
                        pDevice->dwRxAntennaSel = 0;
                        if (byValue & EEP_ANTENNA_AUX) {
                                pDevice->byTxAntennaMode = ANT_A;
-                               if (pDevice->bTxRxAntInv == true)
+                               if (pDevice->bTxRxAntInv)
                                        pDevice->byRxAntennaMode = ANT_B;
                                else
                                        pDevice->byRxAntennaMode = ANT_A;
                        } else {
                                pDevice->byTxAntennaMode = ANT_B;
-                               if (pDevice->bTxRxAntInv == true)
+                               if (pDevice->bTxRxAntInv)
                                        pDevice->byRxAntennaMode = ANT_A;
                                else
                                        pDevice->byRxAntennaMode = ANT_B;
@@ -635,7 +635,7 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
                pDevice->byRFType &= RF_MASK;
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->byRFType = %x\n", pDevice->byRFType);
 
-               if (pDevice->bZoneRegExist == false) {
+               if (!pDevice->bZoneRegExist) {
                        pDevice->byZoneType = pDevice->abyEEPROM[EEP_OFS_ZONETYPE];
                }
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->byZoneType = %x\n", pDevice->byZoneType);
@@ -742,7 +742,7 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
                        if (!(pDevice->byGPIO & GPIO0_DATA)) { pDevice->bHWRadioOff = false; }
 
                }
-               if ((pDevice->bRadioControlOff == true)) {
+               if (pDevice->bRadioControlOff) {
                        CARDbRadioPowerOff(pDevice);
                } else  CARDbRadioPowerOn(pDevice);
 #else
@@ -751,7 +751,7 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
                        pDevice->bHWRadioOff = true;
                }
        }
-       if ((pDevice->bHWRadioOff == true) || (pDevice->bRadioControlOff == true)) {
+       if (pDevice->bHWRadioOff || pDevice->bRadioControlOff) {
                CARDbRadioPowerOff(pDevice);
        }
 
@@ -809,7 +809,7 @@ static bool device_release_WPADEV(PSDevice pDevice)
        int ii = 0;
        // wait_queue_head_t    Set_wait;
        //send device close to wpa_supplicnat layer
-       if (pDevice->bWPADEVUp == true) {
+       if (pDevice->bWPADEVUp) {
                wpahdr = (viawget_wpa_header *)pDevice->skb->data;
                wpahdr->type = VIAWGET_DEVICECLOSE_MSG;
                wpahdr->resp_ie_len = 0;
@@ -826,7 +826,7 @@ static bool device_release_WPADEV(PSDevice pDevice)
                //wait release WPADEV
                //    init_waitqueue_head(&Set_wait);
                //    wait_event_timeout(Set_wait, ((pDevice->wpadev==NULL)&&(pDevice->skb == NULL)),5*HZ);    //1s wait
-               while ((pDevice->bWPADEVUp == true)) {
+               while (pDevice->bWPADEVUp) {
                        set_current_state(TASK_UNINTERRUPTIBLE);
                        schedule_timeout(HZ / 20);          //wait 50ms
                        ii++;
@@ -892,7 +892,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)) {
                printk(KERN_ERR DEVICE_NAME ": Failed to find PCI device.\n");
                device_free_info(pDevice);
                return -ENODEV;
@@ -1633,7 +1633,7 @@ static int device_tx_srv(PSDevice pDevice, unsigned int uIdx) {
                        bFull = true;
                        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) {
                        netif_wake_queue(pDevice->dev);
                }
        }
@@ -1798,7 +1798,7 @@ static int  device_open(struct net_device *dev) {
        pDevice->byReAssocCount = 0;
        pDevice->bWPADEVUp = false;
        // Patch: if WEP key already set by iwconfig but device not yet open
-       if ((pDevice->bEncryptionEnable == true) && (pDevice->bTransmitKey == true)) {
+       if (pDevice->bEncryptionEnable && pDevice->bTransmitKey) {
                KeybSetDefaultKey(&(pDevice->sKey),
                                  (unsigned long)(pDevice->byKeyIndex | (1 << 31)),
                                  pDevice->uKeyLength,
@@ -1895,7 +1895,7 @@ static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev) {
                return 0;
        }
 
-       if (pDevice->bStopTx0Pkt == true) {
+       if (pDevice->bStopTx0Pkt) {
                dev_kfree_skb_irq(skb);
                spin_unlock_irq(&pDevice->lock);
                return 0;
@@ -1924,7 +1924,7 @@ bool device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeI
        SKeyItem        STempKey;
 //    unsigned char byKeyIndex = 0;
 
-       if (pDevice->bStopTx0Pkt == true) {
+       if (pDevice->bStopTx0Pkt) {
                dev_kfree_skb_irq(skb);
                return false;
        }
@@ -1993,14 +1993,14 @@ bool device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, unsigned int uNodeI
        } else if (pDevice->eCurrentPHYType == PHY_TYPE_11A) {
                byPktType = PK_TYPE_11A;
        } else {
-               if (pDevice->bProtectMode == true) {
+               if (pDevice->bProtectMode) {
                        byPktType = PK_TYPE_11GB;
                } else {
                        byPktType = PK_TYPE_11GA;
                }
        }
 
-       if (pDevice->bEncryptionEnable == true)
+       if (pDevice->bEncryptionEnable)
                bNeedEncryption = true;
 
        if (pDevice->bEnableHostWEP) {
@@ -2076,7 +2076,7 @@ static int  device_xmit(struct sk_buff *skb, struct net_device *dev) {
        bool bNodeExist = false;
 
        spin_lock_irq(&pDevice->lock);
-       if (pDevice->bLinkPass == false) {
+       if (!pDevice->bLinkPass) {
                dev_kfree_skb_irq(skb);
                spin_unlock_irq(&pDevice->lock);
                return 0;
@@ -2130,7 +2130,7 @@ static int  device_xmit(struct sk_buff *skb, struct net_device *dev) {
                        }
                }
 
-               if (bNodeExist == false) {
+               if (!bNodeExist) {
                        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);
@@ -2149,7 +2149,7 @@ static int  device_xmit(struct sk_buff *skb, struct net_device *dev) {
                cbFrameBodySize += 8;
        }
 
-       if (pDevice->bEncryptionEnable == true) {
+       if (pDevice->bEncryptionEnable) {
                bNeedEncryption = true;
                // get Transmit key
                do {
@@ -2196,7 +2196,7 @@ static int  device_xmit(struct sk_buff *skb, struct net_device *dev) {
 
        if (pDevice->bEnableHostWEP) {
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG "acdma0: STA index %d\n", uNodeIndex);
-               if (pDevice->bEncryptionEnable == true) {
+               if (pDevice->bEncryptionEnable) {
                        pTransmitKey = &STempKey;
                        pTransmitKey->byCipherSuite = pMgmt->sNodeDBTable[uNodeIndex].byCipherSuite;
                        pTransmitKey->dwKeyIndex = pMgmt->sNodeDBTable[uNodeIndex].dwKeyIndex;
@@ -2286,7 +2286,7 @@ static int  device_xmit(struct sk_buff *skb, struct net_device *dev) {
        } else if (pDevice->eCurrentPHYType == PHY_TYPE_11A) {
                byPktType = PK_TYPE_11A;
        } else {
-               if (pDevice->bProtectMode == true) {
+               if (pDevice->bProtectMode) {
                        byPktType = PK_TYPE_11GB;
                } else {
                        byPktType = PK_TYPE_11GA;
@@ -2297,7 +2297,7 @@ static int  device_xmit(struct sk_buff *skb, struct net_device *dev) {
 //     printk("FIX RATE:CurrentRate is %d");
 //#endif
 
-       if (bNeedEncryption == true) {
+       if (bNeedEncryption) {
                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;
@@ -2306,7 +2306,7 @@ static int  device_xmit(struct sk_buff *skb, struct net_device *dev) {
                                if (pTransmitKey == NULL) {
                                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Don't Find TX KEY\n");
                                } else {
-                                       if (bTKIP_UseGTK == true) {
+                                       if (bTKIP_UseGTK) {
                                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "error: KEY is GTK!!~~\n");
                                        } else {
                                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Find PTK [%lX]\n", pTransmitKey->dwKeyIndex);
@@ -2493,7 +2493,7 @@ static  irqreturn_t  device_intr(int irq,  void *dev_instance) {
                                MACvSelectPage0(pDevice->PortOffset);
                                //xxxx
                                // WCMDbFlushCommandQueue(pDevice->pMgmt, true);
-                               if (set_channel(pDevice, pDevice->pCurrMeasureEID->sReq.byChannel) == true) {
+                               if (set_channel(pDevice, pDevice->pCurrMeasureEID->sReq.byChannel)) {
                                        pDevice->bMeasureInProgress = true;
                                        MACvSelectPage1(pDevice->PortOffset);
                                        MACvRegBitsOn(pDevice->PortOffset, MAC_REG_MSRCTL, MSRCTL_READY);
@@ -2544,12 +2544,12 @@ static  irqreturn_t  device_intr(int irq,  void *dev_instance) {
                        if (pDevice->dwIsr & ISR_QUIETSTART) {
                                do {
                                        ;
-                               } while (CARDbStartQuiet(pDevice) == false);
+                               } while (!CARDbStartQuiet(pDevice));
                        }
                }
 
                if (pDevice->dwIsr & ISR_TBTT) {
-                       if (pDevice->bEnableFirstQuiet == true) {
+                       if (pDevice->bEnableFirstQuiet) {
                                pDevice->byQuietStartCount--;
                                if (pDevice->byQuietStartCount == 0) {
                                        pDevice->bEnableFirstQuiet = false;
@@ -2558,7 +2558,7 @@ static  irqreturn_t  device_intr(int irq,  void *dev_instance) {
                                        MACvSelectPage0(pDevice->PortOffset);
                                }
                        }
-                       if ((pDevice->bChannelSwitch == true) &&
+                       if (pDevice->bChannelSwitch &&
                            (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE)) {
                                pDevice->byChannelSwitchCount--;
                                if (pDevice->byChannelSwitchCount == 0) {
@@ -2575,7 +2575,7 @@ static  irqreturn_t  device_intr(int irq,  void *dev_instance) {
                        if (pDevice->eOPMode == OP_MODE_ADHOC) {
                                //pDevice->bBeaconSent = false;
                        } else {
-                               if ((pDevice->bUpdateBBVGA) && (pDevice->bLinkPass == true) && (pDevice->uCurrRSSI != 0)) {
+                               if ((pDevice->bUpdateBBVGA) && pDevice->bLinkPass && (pDevice->uCurrRSSI != 0)) {
                                        long            ldBm;
 
                                        RFvRSSITodBm(pDevice, (unsigned char) pDevice->uCurrRSSI, &ldBm);
@@ -2642,7 +2642,7 @@ static  irqreturn_t  device_intr(int irq,  void *dev_instance) {
                        }
                        pDevice->bBeaconSent = true;
 
-                       if (pDevice->bChannelSwitch == true) {
+                       if (pDevice->bChannelSwitch) {
                                pDevice->byChannelSwitchCount--;
                                if (pDevice->byChannelSwitchCount == 0) {
                                        pDevice->bChannelSwitch = false;
@@ -3237,7 +3237,7 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
                        netif_stop_queue(pDevice->dev);
 #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
                        pMgmt->eScanType = WMAC_SCAN_ACTIVE;
-                       if (pDevice->bWPASuppWextEnabled != true)
+                       if (!pDevice->bWPASuppWextEnabled)
 #endif
                                bScheduleCommand((void *)pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID);
                        bScheduleCommand((void *)pDevice, WLAN_CMD_SSID, NULL);
@@ -3373,7 +3373,7 @@ viawget_resume(struct pci_dev *pcid)
                spin_lock_irq(&pDevice->lock);
                MACvRestoreContext(pDevice->PortOffset, pDevice->abyMacContext);
                device_init_registers(pDevice, DEVICE_INIT_DXPL);
-               if (pMgmt->sNodeDBTable[0].bActive == true) { // Assoc with BSS
+               if (pMgmt->sNodeDBTable[0].bActive) { // Assoc with BSS
                        pMgmt->sNodeDBTable[0].bActive = false;
                        pDevice->bLinkPass = false;
                        if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {

diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c
index 0ff51cb4a207eeb045720a3884be0eebefc11823..c60f3e6dc6f8f0894eaacae75ea19d76d92e358d 100644 (file)
--- a/drivers/staging/vt6655/dpc.c
+++ b/drivers/staging/vt6655/dpc.c
@@ -379,7 +379,7 @@ device_receive_frame(
 
        pMACHeader = (PS802_11Header)((unsigned char *)(skb->data) + 8);
 //PLICE_DEBUG<-
-       if (pDevice->bMeasureInProgress == true) {
+       if (pDevice->bMeasureInProgress) {
                if ((*pbyRsr & RSR_CRCOK) != 0) {
                        pDevice->byBasicMap |= 0x01;
                }
@@ -436,7 +436,7 @@ device_receive_frame(
        }
 
        if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
-               if (s_bAPModeRxCtl(pDevice, pbyFrame, iSANodeIndex) == true) {
+               if (s_bAPModeRxCtl(pDevice, pbyFrame, iSANodeIndex)) {
                        return false;
                }
        }
@@ -608,8 +608,7 @@ device_receive_frame(
                        }
                } else {
                        // discard DATA packet while not associate || BSSID error
-                       if ((pDevice->bLinkPass == false) ||
-                           !(*pbyRsr & RSR_BSSIDOK)) {
+                       if (!pDevice->bLinkPass || !(*pbyRsr & RSR_BSSIDOK)) {
                                if (bDeFragRx) {
                                        if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) {
                                                DBG_PRT(MSG_LEVEL_ERR, KERN_ERR "%s: can not alloc more frag bufs\n",
@@ -658,7 +657,7 @@ device_receive_frame(
        // Now it only supports 802.11g Infrastructure Mode, and support rate must up to 54 Mbps
        if (pDevice->bDiversityEnable && (FrameSize > 50) &&
            (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) &&
-           (pDevice->bLinkPass == true)) {
+           pDevice->bLinkPass) {
                BBvAntennaDiversity(pDevice, s_byGetRateIdx(*pbyRxRate), 0);
        }
 
@@ -683,7 +682,7 @@ device_receive_frame(
 
        // -----------------------------------------------
 
-       if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) && (pDevice->bEnable8021x == true)) {
+       if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) && pDevice->bEnable8021x) {
                unsigned char abyMacHdr[24];
 
                // Only 802.1x packet incoming allowed
@@ -698,7 +697,7 @@ device_receive_frame(
                if (wEtherType == ETH_P_PAE) {
                        skb->dev = pDevice->apdev;
 
-                       if (bIsWEP == true) {
+                       if (bIsWEP) {
                                // strip IV header(8)
                                memcpy(&abyMacHdr[0], (skb->data + 4), 24);
                                memcpy((skb->data + 4 + cbIVOffset), &abyMacHdr[0], 24);
@@ -770,8 +769,9 @@ device_receive_frame(
                        //DBG_PRN_GRP12(("LocalL: %lx, LocalR: %lx\n", dwLocalMIC_L, dwLocalMIC_R));
                        //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dwMICKey0= %lx,dwMICKey1= %lx \n", dwMICKey0, dwMICKey1);
 
-                       if ((cpu_to_le32(*pdwMIC_L) != dwLocalMIC_L) || (cpu_to_le32(*pdwMIC_R) != dwLocalMIC_R) ||
-                           (pDevice->bRxMICFail == true)) {
+                       if ((cpu_to_le32(*pdwMIC_L) != dwLocalMIC_L) ||
+                           (cpu_to_le32(*pdwMIC_R) != dwLocalMIC_R) ||
+                           pDevice->bRxMICFail) {
                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "MIC comparison is fail!\n");
                                pDevice->bRxMICFail = false;
                                //pDevice->s802_11Counter.TKIPLocalMICFailures.QuadPart++;
@@ -894,13 +894,13 @@ device_receive_frame(
                return false;
 
        if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
-               if (s_bAPModeRxData(pDevice,
+               if (!s_bAPModeRxData(pDevice,
                                    skb,
                                    FrameSize,
                                    cbHeaderOffset,
                                    iSANodeIndex,
                                    iDANodeIndex
-) == false) {
+)) {
                        if (bDeFragRx) {
                                if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) {
                                        DBG_PRT(MSG_LEVEL_ERR, KERN_ERR "%s: can not alloc more frag bufs\n",
@@ -1123,7 +1123,7 @@ static bool s_bHandleRxEncryption(
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pKey == NULL\n");
                if (byDecMode == KEY_CTL_WEP) {
 //            pDevice->s802_11Counter.WEPUndecryptableCount.QuadPart++;
-               } else if (pDevice->bLinkPass == true) {
+               } else if (pDevice->bLinkPass) {
 //            pDevice->s802_11Counter.DecryptFailureCount.QuadPart++;
                }
                return false;
@@ -1131,7 +1131,7 @@ static bool s_bHandleRxEncryption(
        if (byDecMode != pKey->byCipherSuite) {
                if (byDecMode == KEY_CTL_WEP) {
 //            pDevice->s802_11Counter.WEPUndecryptableCount.QuadPart++;
-               } else if (pDevice->bLinkPass == true) {
+               } else if (pDevice->bLinkPass) {
 //            pDevice->s802_11Counter.DecryptFailureCount.QuadPart++;
                }
                *pKeyOut = NULL;
@@ -1234,7 +1234,7 @@ static bool s_bHostWepRxEncryption(
        if (byDecMode != pKey->byCipherSuite) {
                if (byDecMode == KEY_CTL_WEP) {
 //            pDevice->s802_11Counter.WEPUndecryptableCount.QuadPart++;
-               } else if (pDevice->bLinkPass == true) {
+               } else if (pDevice->bLinkPass) {
 //            pDevice->s802_11Counter.DecryptFailureCount.QuadPart++;
                }
                return false;
@@ -1245,7 +1245,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 == true) ||
-                   (bOnFly == false)) {
+                   !bOnFly) {
                        // Software WEP
                        // 1. 3253A
                        // 2. WEP 256
@@ -1277,7 +1277,7 @@ static bool s_bHostWepRxEncryption(
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "TSC0_15: %x\n", *pwRxTSC15_0);
 
                if (byDecMode == KEY_CTL_TKIP) {
-                       if ((pDevice->byLocalID <= REV_ID_VT3253_A1) || (bOnFly == false)) {
+                       if ((pDevice->byLocalID <= REV_ID_VT3253_A1) || !bOnFly) {
                                // Software TKIP
                                // 1. 3253 A
                                // 2. NotOnFly
@@ -1297,7 +1297,7 @@ static bool s_bHostWepRxEncryption(
                }
 
                if (byDecMode == KEY_CTL_CCMP) {
-                       if (bOnFly == false) {
+                       if (!bOnFly) {
                                // Software CCMP
                                // NotOnFly
                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "soft KEY_CTL_CCMP\n");

diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
index aab0012bba92909611659b78ef982d48aec82cfb..3d30a435cabda296e43b6ff0c15f3cccccfb439c 100644 (file)
--- a/drivers/staging/vt6655/hostap.c
+++ b/drivers/staging/vt6655/hostap.c
@@ -494,11 +494,11 @@ static int hostap_set_encryption(PSDevice pDevice,
        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " hostap_set_encryption: alg %d \n", param->u.crypt.alg);
 
        if (param->u.crypt.alg == WPA_ALG_NONE) {
-               if (pMgmt->sNodeDBTable[iNodeIndex].bOnFly == true) {
-                       if (KeybRemoveKey(&(pDevice->sKey),
+               if (pMgmt->sNodeDBTable[iNodeIndex].bOnFly) {
+                       if (!KeybRemoveKey(&(pDevice->sKey),
                                          param->sta_addr,
                                          pMgmt->sNodeDBTable[iNodeIndex].dwKeyIndex,
-                                         pDevice->PortOffset) == false) {
+                                         pDevice->PortOffset)) {
                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "KeybRemoveKey fail \n");
                        }
                        pMgmt->sNodeDBTable[iNodeIndex].bOnFly = false;
@@ -556,7 +556,7 @@ static int hostap_set_encryption(PSDevice pDevice,
                                       (unsigned char *)abyKey,
                                       KEY_CTL_WEP,
                                       pDevice->PortOffset,
-                                      pDevice->byLocalID) == true) {
+                                      pDevice->byLocalID)) {
                                pMgmt->sNodeDBTable[iNodeIndex].bOnFly = true;
 
                        } else {
@@ -623,7 +623,7 @@ static int hostap_set_encryption(PSDevice pDevice,
                               (unsigned char *)abyKey,
                               byKeyDecMode,
                               pDevice->PortOffset,
-                              pDevice->byLocalID) == true) {
+                              pDevice->byLocalID)) {
                        pMgmt->sNodeDBTable[iNodeIndex].bOnFly = true;
 
                } else {
@@ -635,7 +635,7 @@ static int hostap_set_encryption(PSDevice pDevice,
 
        }
 
-       if (bKeyTableFull == true) {
+       if (bKeyTableFull) {
                wKeyCtl &= 0x7F00;              // clear all key control filed
                wKeyCtl |= (byKeyDecMode << 4);
                wKeyCtl |= (byKeyDecMode);

diff --git a/drivers/staging/vt6655/key.c b/drivers/staging/vt6655/key.c
index 04c1304d16e59105b9616029bc6da2a2db0f8abc..eab3b41f9e3c77b1c7d41fa18a29c56d8a17d901 100644 (file)
--- a/drivers/staging/vt6655/key.c
+++ b/drivers/staging/vt6655/key.c
@@ -64,13 +64,12 @@ s_vCheckKeyTableValid(PSKeyManagement pTable, unsigned long dwIoBase)
        int i;
 
        for (i = 0; i < MAX_KEY_TABLE; i++) {
-               if ((pTable->KeyTable[i].bInUse == true) &&
-                   (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)
-) {
+               if (pTable->KeyTable[i].bInUse &&
+                   !pTable->KeyTable[i].PairwiseKey.bKeyValid &&
+                   !pTable->KeyTable[i].GroupKey[0].bKeyValid &&
+                   !pTable->KeyTable[i].GroupKey[1].bKeyValid &&
+                   !pTable->KeyTable[i].GroupKey[2].bKeyValid &&
+                   !pTable->KeyTable[i].GroupKey[3].bKeyValid) {
                        pTable->KeyTable[i].bInUse = false;
                        pTable->KeyTable[i].wKeyCtl = 0;
                        pTable->KeyTable[i].bSoftWEP = false;
@@ -140,17 +139,17 @@ bool KeybGetKey(
 
        *pKey = NULL;
        for (i = 0; i < MAX_KEY_TABLE; i++) {
-               if ((pTable->KeyTable[i].bInUse == true) &&
+               if (pTable->KeyTable[i].bInUse &&
                    ether_addr_equal(pTable->KeyTable[i].abyBSSID, pbyBSSID)) {
                        if (dwKeyIndex == 0xFFFFFFFF) {
-                               if (pTable->KeyTable[i].PairwiseKey.bKeyValid == true) {
+                               if (pTable->KeyTable[i].PairwiseKey.bKeyValid) {
                                        *pKey = &(pTable->KeyTable[i].PairwiseKey);
                                        return true;
                                } else {
                                        return false;
                                }
                        } else if (dwKeyIndex < MAX_GROUP_KEY) {
-                               if (pTable->KeyTable[i].GroupKey[dwKeyIndex].bKeyValid == true) {
+                               if (pTable->KeyTable[i].GroupKey[dwKeyIndex].bKeyValid) {
                                        *pKey = &(pTable->KeyTable[i].GroupKey[dwKeyIndex]);
                                        return true;
                                } else {
@@ -202,12 +201,11 @@ bool KeybSetKey(
 
        j = (MAX_KEY_TABLE-1);
        for (i = 0; i < (MAX_KEY_TABLE - 1); i++) {
-               if ((pTable->KeyTable[i].bInUse == false) &&
-                   (j == (MAX_KEY_TABLE-1))) {
+               if (!pTable->KeyTable[i].bInUse && (j == (MAX_KEY_TABLE-1))) {
                        // found empty table
                        j = i;
                }
-               if ((pTable->KeyTable[i].bInUse == true) &&
+               if (pTable->KeyTable[i].bInUse &&
                    ether_addr_equal(pTable->KeyTable[i].abyBSSID, pbyBSSID)) {
                        // found table already exist
                        if ((dwKeyIndex & PAIRWISE_KEY) != 0) {
@@ -384,7 +382,7 @@ bool KeybRemoveKey(
        }
 
        for (i = 0; i < MAX_KEY_TABLE; i++) {
-               if ((pTable->KeyTable[i].bInUse == true) &&
+               if (pTable->KeyTable[i].bInUse &&
                    ether_addr_equal(pTable->KeyTable[i].abyBSSID, pbyBSSID)) {
                        if ((dwKeyIndex & PAIRWISE_KEY) != 0) {
                                pTable->KeyTable[i].PairwiseKey.bKeyValid = false;
@@ -428,7 +426,7 @@ bool KeybRemoveAllKey(
        int i, u;
 
        for (i = 0; i < MAX_KEY_TABLE; i++) {
-               if ((pTable->KeyTable[i].bInUse == true) &&
+               if (pTable->KeyTable[i].bInUse &&
                    ether_addr_equal(pTable->KeyTable[i].abyBSSID, pbyBSSID)) {
                        pTable->KeyTable[i].PairwiseKey.bKeyValid = false;
                        for (u = 0; u < MAX_GROUP_KEY; u++) {
@@ -461,7 +459,7 @@ void KeyvRemoveWEPKey(
 )
 {
        if ((dwKeyIndex & 0x000000FF) < MAX_GROUP_KEY) {
-               if (pTable->KeyTable[MAX_KEY_TABLE-1].bInUse == true) {
+               if (pTable->KeyTable[MAX_KEY_TABLE-1].bInUse) {
                        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;
                                if ((dwKeyIndex & 0x7FFFFFFF) == (pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex & 0x7FFFFFFF)) {
@@ -511,10 +509,10 @@ bool KeybGetTransmitKey(
 
        *pKey = NULL;
        for (i = 0; i < MAX_KEY_TABLE; i++) {
-               if ((pTable->KeyTable[i].bInUse == true) &&
+               if (pTable->KeyTable[i].bInUse &&
                    ether_addr_equal(pTable->KeyTable[i].abyBSSID, pbyBSSID)) {
                        if (dwKeyType == PAIRWISE_KEY) {
-                               if (pTable->KeyTable[i].PairwiseKey.bKeyValid == true) {
+                               if (pTable->KeyTable[i].PairwiseKey.bKeyValid) {
                                        *pKey = &(pTable->KeyTable[i].PairwiseKey);
 
                                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "KeybGetTransmitKey:");
@@ -535,7 +533,7 @@ bool KeybGetTransmitKey(
                                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ERROR: dwGTKeyIndex == 0 !!!\n");
                                        return false;
                                }
-                               if (pTable->KeyTable[i].GroupKey[(pTable->KeyTable[i].dwGTKeyIndex&0x000000FF)].bKeyValid == true) {
+                               if (pTable->KeyTable[i].GroupKey[(pTable->KeyTable[i].dwGTKeyIndex&0x000000FF)].bKeyValid) {
                                        *pKey = &(pTable->KeyTable[i].GroupKey[(pTable->KeyTable[i].dwGTKeyIndex&0x000000FF)]);
 
                                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "KeybGetTransmitKey:");
@@ -583,8 +581,8 @@ bool KeybCheckPairewiseKey(
 
        *pKey = NULL;
        for (i = 0; i < MAX_KEY_TABLE; i++) {
-               if ((pTable->KeyTable[i].bInUse == true) &&
-                   (pTable->KeyTable[i].PairwiseKey.bKeyValid == true)) {
+               if (pTable->KeyTable[i].bInUse &&
+                   pTable->KeyTable[i].PairwiseKey.bKeyValid) {
                        *pKey = &(pTable->KeyTable[i].PairwiseKey);
                        return true;
                }
@@ -657,7 +655,7 @@ bool KeybSetDefaultKey(
                pTable->KeyTable[MAX_KEY_TABLE-1].wKeyCtl |= 0x4000;              // disable on-fly disable address match
                pTable->KeyTable[MAX_KEY_TABLE-1].bSoftWEP = true;
        } else {
-               if (pTable->KeyTable[MAX_KEY_TABLE-1].bSoftWEP == false)
+               if (!pTable->KeyTable[MAX_KEY_TABLE-1].bSoftWEP)
                        pTable->KeyTable[MAX_KEY_TABLE-1].wKeyCtl |= 0xC000;          // enable on-fly disable address match
        }
 
@@ -740,7 +738,7 @@ bool KeybSetAllGroupKey(
        }
 
        for (i = 0; i < MAX_KEY_TABLE - 1; i++) {
-               if (pTable->KeyTable[i].bInUse == true) {
+               if (pTable->KeyTable[i].bInUse) {
                        // found table already exist
                        // Group key
                        pKey = &(pTable->KeyTable[i].GroupKey[dwKeyIndex & 0x000000FF]);

diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c
index 001d15c0fa40721c7188e953a970fc1ebbd8dd39..21bd8a1126d794056f87a397d708fd0236c7e755 100644 (file)
--- a/drivers/staging/vt6655/mac.c
+++ b/drivers/staging/vt6655/mac.c
@@ -957,13 +957,13 @@ bool MACbSafeStop(unsigned long dwIoBase)
 {
        MACvRegBitsOff(dwIoBase, MAC_REG_TCR, TCR_AUTOBCNTX);
 
-       if (MACbSafeRxOff(dwIoBase) == false) {
+       if (!MACbSafeRxOff(dwIoBase)) {
                DBG_PORT80(0xA1);
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " MACbSafeRxOff == false)\n");
                MACbSafeSoftwareReset(dwIoBase);
                return false;
        }
-       if (MACbSafeTxOff(dwIoBase) == false) {
+       if (!MACbSafeTxOff(dwIoBase)) {
                DBG_PORT80(0xA2);
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " MACbSafeTxOff == false)\n");
                MACbSafeSoftwareReset(dwIoBase);

diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c
index 2340d2f0399b20da7db606837e53c64807986c55..3da2838006e334601aa55666fcdcefd735ad6f0c 100644 (file)
--- a/drivers/staging/vt6655/power.c
+++ b/drivers/staging/vt6655/power.c
@@ -284,16 +284,15 @@ PSbSendNullPacket(
        PSMgmtObject        pMgmt = pDevice->pMgmt;
        unsigned int uIdx;
 
-       if (pDevice->bLinkPass == false) {
+       if (!pDevice->bLinkPass) {
                return false;
        }
 #ifdef TxInSleep
-       if ((pDevice->bEnablePSMode == false) &&
-           (pDevice->fTxDataInSleep == false)) {
+       if (!pDevice->bEnablePSMode && !pDevice->fTxDataInSleep) {
                return false;
        }
 #else
-       if (pDevice->bEnablePSMode == false) {
+       if (!pDevice->bEnablePSMode) {
                return false;
        }
 #endif

diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c
index ce173cc16c192544da18dc3d0dddf09be1ed553a..edb1b2768b17353bc93aed5a82f929b91fb78499 100644 (file)
--- a/drivers/staging/vt6655/rf.c
+++ b/drivers/staging/vt6655/rf.c
@@ -976,7 +976,7 @@ bool RFbSetPower(
        }
 
        bResult = RFbRawSetPower(pDevice, byPwr, uRATE);
-       if (bResult == true) {
+       if (bResult) {
                pDevice->byCurPwr = byPwr;
        }
        return bResult;

diff --git a/drivers/staging/vt6655/vntwifi.c b/drivers/staging/vt6655/vntwifi.c
index d2bdb71fe62d37a914e5d9fc0c43fff570425320..e78aedf990778088686893d6866be20d133bab5c 100644 (file)
--- a/drivers/staging/vt6655/vntwifi.c
+++ b/drivers/staging/vt6655/vntwifi.c
@@ -494,7 +494,7 @@ VNTWIFIvUpdateNodeTxCounter(
                }
        }
        pMgmt->sNodeDBTable[uNodeIndex].uTxAttempts++;
-       if (bTxOk == true) {
+       if (bTxOk) {
                // transmit success, TxAttempts at least plus one
                pMgmt->sNodeDBTable[uNodeIndex].uTxOk[MAX_RATE]++;
                pMgmt->sNodeDBTable[uNodeIndex].uTxOk[wRate]++;
@@ -584,7 +584,7 @@ VNTWIFIbyGetKeyCypher(
 {
        PSMgmtObject    pMgmt = (PSMgmtObject)pMgmtHandle;
 
-       if (bGroupKey == true) {
+       if (bGroupKey) {
                return pMgmt->byCSSGK;
        } else {
                return pMgmt->byCSSPK;
@@ -731,7 +731,7 @@ VNTWIFIbMeasureReport(
                pMgmt->uLengthOfRepEIDs += (2 + pMgmt->pCurrMeasureEIDRep->len);
                pMgmt->pCurrMeasureEIDRep = (PWLAN_IE_MEASURE_REP) pbyCurrentEID;
        }
-       if (bEndOfReport == true) {
+       if (bEndOfReport) {
                IEEE11hbMSRRepTx(pMgmt);
        }
        //spin_unlock_irq(&pDevice->lock);

diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c
index 9c57eefe78fb12c9109a6aa2930046f3cf03c41b..72caaa203ddc3e5fb5c0a62625f27d80f12ac7ca 100644 (file)
--- a/drivers/staging/vt6655/wcmd.c
+++ b/drivers/staging/vt6655/wcmd.c
@@ -317,7 +317,7 @@ vCommandTimer(
 
        if (pDevice->dwDiagRefCount != 0)
                return;
-       if (pDevice->bCmdRunning != true)
+       if (!pDevice->bCmdRunning)
                return;
 
        spin_lock_irq(&pDevice->lock);
@@ -326,7 +326,7 @@ vCommandTimer(
        case WLAN_CMD_SCAN_START:
 
                pDevice->byReAssocCount = 0;
-               if (pDevice->bRadioOff == true) {
+               if (pDevice->bRadioOff) {
                        s_bCommandComplete(pDevice);
                        spin_unlock_irq(&pDevice->lock);
                        return;
@@ -393,7 +393,7 @@ vCommandTimer(
 
                        vAdHocBeaconStop(pDevice);
 
-                       if (set_channel(pMgmt->pAdapter, pMgmt->uScanChannel) == true) {
+                       if (set_channel(pMgmt->pAdapter, pMgmt->uScanChannel)) {
                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "SCAN Channel: %d\n", pMgmt->uScanChannel);
                        } else {
                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "SET SCAN Channel Fail: %d\n", pMgmt->uScanChannel);
@@ -408,7 +408,7 @@ vCommandTimer(
 
                        }
 
-                       if ((pMgmt->b11hEnable == false) ||
+                       if (!pMgmt->b11hEnable ||
                            (pMgmt->uScanChannel < CB_MAX_CHANNEL_24G)) {
                                s_vProbeChannel(pDevice);
                                spin_unlock_irq(&pDevice->lock);
@@ -498,7 +498,7 @@ vCommandTimer(
 
        case WLAN_CMD_SSID_START:
                pDevice->byReAssocCount = 0;
-               if (pDevice->bRadioOff == true) {
+               if (pDevice->bRadioOff) {
                        s_bCommandComplete(pDevice);
                        spin_unlock_irq(&pDevice->lock);
                        return;
@@ -659,7 +659,7 @@ vCommandTimer(
                                netif_wake_queue(pDevice->dev);
                        }
 #ifdef TxInSleep
-                       if (pDevice->IsTxDataTrigger != false)   {    //TxDataTimer is not triggered at the first time
+                       if (pDevice->IsTxDataTrigger) {    //TxDataTimer is not triggered at the first time
                                del_timer(&pDevice->sTimerTxData);
                                init_timer(&pDevice->sTimerTxData);
                                pDevice->sTimerTxData.data = (unsigned long) pDevice;
@@ -694,7 +694,7 @@ vCommandTimer(
                        pMgmt->eCurrState = WMAC_STATE_IDLE;
                        pMgmt->eCurrMode = WMAC_MODE_STANDBY;
                        pDevice->bLinkPass = false;
-                       if (pDevice->bEnableHostWEP == true)
+                       if (pDevice->bEnableHostWEP)
                                BSSvClearNodeDBTable(pDevice, 1);
                        else
                                BSSvClearNodeDBTable(pDevice, 0);
@@ -776,7 +776,7 @@ vCommandTimer(
 
        case WLAN_CMD_RADIO_START:
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "eCommandState == WLAN_CMD_RADIO_START\n");
-               if (pDevice->bRadioCmd == true)
+               if (pDevice->bRadioCmd)
                        CARDbRadioPowerOn(pDevice);
                else
                        CARDbRadioPowerOff(pDevice);
@@ -948,7 +948,7 @@ bool bScheduleCommand(
        ADD_ONE_WITH_WRAP_AROUND(pDevice->uCmdEnqueueIdx, CMD_Q_SIZE);
        pDevice->cbFreeCmdQueue--;
 
-       if (pDevice->bCmdRunning == false) {
+       if (!pDevice->bCmdRunning) {
                s_bCommandComplete(pDevice);
        } else {
        }
@@ -1031,8 +1031,8 @@ BSSvSecondTxData(
 
        spin_lock_irq(&pDevice->lock);
 #if 1
-       if (((pDevice->bLinkPass == true) && (pMgmt->eAuthenMode < WMAC_AUTH_WPA)) ||  //open && sharekey linking
-          (pDevice->fWPA_Authened == true)) {   //wpa linking
+       if ((pDevice->bLinkPass && (pMgmt->eAuthenMode < WMAC_AUTH_WPA)) ||  //open && sharekey linking
+           pDevice->fWPA_Authened) {   //wpa linking
 #else
                if (pDevice->bLinkPass == true) {
 #endif

diff --git a/drivers/staging/vt6655/wctl.c b/drivers/staging/vt6655/wctl.c
index f05f9f55398bf7a390068495b60ace381a978bc7..950039f6d1284fe1283bc632fc1164dbd3347be8 100644 (file)
--- a/drivers/staging/vt6655/wctl.c
+++ b/drivers/staging/vt6655/wctl.c
@@ -110,7 +110,7 @@ unsigned int WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader)
        unsigned int ii;
 
        for (ii = 0; ii < pDevice->cbDFCB; ii++) {
-               if ((pDevice->sRxDFCB[ii].bInUse == true) &&
+               if (pDevice->sRxDFCB[ii].bInUse &&
                    ether_addr_equal(pDevice->sRxDFCB[ii].abyAddr2,
                                     pMACHeader->abyAddr2)) {
                        //
@@ -141,7 +141,7 @@ unsigned int WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader)
        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) {
                        pDevice->cbFreeDFCB--;
                        pDevice->sRxDFCB[ii].uLifetime = pDevice->dwMaxReceiveLifetime;
                        pDevice->sRxDFCB[ii].bInUse = true;
@@ -174,7 +174,7 @@ bool WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, unsigned i
 {
        unsigned int uHeaderSize;
 
-       if (bWEP == true) {
+       if (bWEP) {
                uHeaderSize = 28;
                if (bExtIV)
                        // ExtIV

diff --git a/drivers/staging/vt6655/wmgr.c b/drivers/staging/vt6655/wmgr.c
index ed4b32b6d9cee7c4fdf8e1ca6c33ea61b06f928c..40bb9004a9214ca0190cf8983a3527af26b881a1 100644 (file)
--- a/drivers/staging/vt6655/wmgr.c
+++ b/drivers/staging/vt6655/wmgr.c
@@ -468,15 +468,15 @@ vMgrAssocBeginSta(
        // ERP Phy (802.11g) should support short preamble.
        if (pMgmt->eCurrentPHYMode == PHY_TYPE_11G) {
                pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_SHORTPREAMBLE(1);
-               if (CARDbIsShorSlotTime(pMgmt->pAdapter) == true) {
+               if (CARDbIsShorSlotTime(pMgmt->pAdapter)) {
                        pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_SHORTSLOTTIME(1);
                }
        } else if (pMgmt->eCurrentPHYMode == PHY_TYPE_11B) {
-               if (CARDbIsShortPreamble(pMgmt->pAdapter) == true) {
+               if (CARDbIsShortPreamble(pMgmt->pAdapter)) {
                        pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_SHORTPREAMBLE(1);
                }
        }
-       if (pMgmt->b11hEnable == true)
+       if (pMgmt->b11hEnable)
                pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_SPECTRUMMNG(1);
 
        /* build an assocreq frame and send it */
@@ -539,15 +539,15 @@ vMgrReAssocBeginSta(
        // ERP Phy (802.11g) should support short preamble.
        if (pMgmt->eCurrentPHYMode == PHY_TYPE_11G) {
                pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_SHORTPREAMBLE(1);
-               if (CARDbIsShorSlotTime(pMgmt->pAdapter) == true) {
+               if (CARDbIsShorSlotTime(pMgmt->pAdapter)) {
                        pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_SHORTSLOTTIME(1);
                }
        } else if (pMgmt->eCurrentPHYMode == PHY_TYPE_11B) {
-               if (CARDbIsShortPreamble(pMgmt->pAdapter) == true) {
+               if (CARDbIsShortPreamble(pMgmt->pAdapter)) {
                        pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_SHORTPREAMBLE(1);
                }
        }
-       if (pMgmt->b11hEnable == true)
+       if (pMgmt->b11hEnable)
                pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_SPECTRUMMNG(1);
 
        pTxPacket = s_MgrMakeReAssocRequest
@@ -736,7 +736,7 @@ s_vMgrRxAssocRequest(
                        pDevice->bProtectMode = true;
                        pDevice->bNonERPPresent = true;
                }
-               if (pMgmt->sNodeDBTable[uNodeIndex].bShortPreamble == false) {
+               if (!pMgmt->sNodeDBTable[uNodeIndex].bShortPreamble) {
                        pDevice->bBarkerPreambleMd = true;
                }
 
@@ -891,7 +891,7 @@ s_vMgrRxReAssocRequest(
                        pDevice->bProtectMode = true;
                        pDevice->bNonERPPresent = true;
                }
-               if (pMgmt->sNodeDBTable[uNodeIndex].bShortPreamble == false) {
+               if (!pMgmt->sNodeDBTable[uNodeIndex].bShortPreamble) {
                        pDevice->bBarkerPreambleMd = true;
                }
 
@@ -1837,7 +1837,7 @@ s_vMgrRxBeacon(
                bChannelHit = true;
        }
 //2008-0730-01<Add>by MikeLiu
-       if (ChannelExceedZoneType(pDevice, byCurrChannel) == true)
+       if (ChannelExceedZoneType(pDevice, byCurrChannel))
                return;
 
        if (sFrame.pERP != NULL) {
@@ -1957,9 +1957,9 @@ s_vMgrRxBeacon(
                }
        }
 
-       if ((WLAN_GET_CAP_INFO_ESS(*sFrame.pwCapInfo) == true) &&
-           (bIsBSSIDEqual == true) &&
-           (bIsSSIDEqual == true) &&
+       if (WLAN_GET_CAP_INFO_ESS(*sFrame.pwCapInfo) &&
+           bIsBSSIDEqual &&
+           bIsSSIDEqual &&
            (pMgmt->eCurrMode == WMAC_MODE_ESS_STA) &&
            (pMgmt->eCurrState == WMAC_STATE_ASSOC)) {
                // add state check to prevent reconnect fail since we'll receive Beacon
@@ -2001,7 +2001,7 @@ s_vMgrRxBeacon(
                                          &(pMgmt->sNodeDBTable[0].byTopCCKBasicRate),
                                          &(pMgmt->sNodeDBTable[0].byTopOFDMBasicRate)
                                );
-                       if (bUpdatePhyParameter == true) {
+                       if (bUpdatePhyParameter) {
                                CARDbSetPhyParameter(pMgmt->pAdapter,
                                                     pMgmt->eCurrentPHYMode,
                                                     pMgmt->wCurrCapInfo,
@@ -2023,7 +2023,7 @@ s_vMgrRxBeacon(
                                                   sFrame.pIE_CHSW->byCount
                                        );
 
-                       } else if (bIsChannelEqual == false) {
+                       } else if (!bIsChannelEqual) {
                                set_channel(pMgmt->pAdapter, pBSSList->uChannel);
                        }
                }
@@ -2067,12 +2067,12 @@ s_vMgrRxBeacon(
        }
 
        // if infra mode
-       if (bIsAPBeacon == true) {
+       if (bIsAPBeacon) {
                // Infra mode: Local TSF always follow AP's TSF if Difference huge.
                if (bTSFLargeDiff)
                        bUpdateTSF = true;
 
-               if ((pDevice->bEnablePSMode == true) && (sFrame.pTIM != 0)) {
+               if (pDevice->bEnablePSMode && (sFrame.pTIM != 0)) {
                        // deal with DTIM, analysis TIM
                        pMgmt->bMulticastTIM = WLAN_MGMT_IS_MULTICAST_TIM(sFrame.pTIM->byBitMapCtl) ? true : false;
                        pMgmt->byDTIMCount = sFrame.pTIM->byDTIMCount;
@@ -2110,7 +2110,7 @@ s_vMgrRxBeacon(
                        } else {
                                pMgmt->bInTIMWake = false;
                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN: Not In TIM..\n");
-                               if (pDevice->bPWBitOn == false) {
+                               if (!pDevice->bPWBitOn) {
                                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN: Send Null Packet\n");
                                        if (PSbSendNullPacket(pDevice))
                                                pDevice->bPWBitOn = true;
@@ -2480,7 +2480,7 @@ vMgrCreateOwnIBSS(
                pMgmt->wCurrCapInfo &= (~WLAN_SET_CAP_INFO_SHORTPREAMBLE(1));
        }
 
-       if ((pMgmt->b11hEnable == true) &&
+       if (pMgmt->b11hEnable &&
            (pMgmt->eCurrentPHYMode == PHY_TYPE_11A)) {
                pMgmt->wCurrCapInfo |= WLAN_SET_CAP_INFO_SPECTRUMMNG(1);
        } else {
@@ -2530,7 +2530,7 @@ vMgrJoinBSSBegin(
        unsigned char byTopOFDMBasicRate = RATE_1M;
 
        for (ii = 0; ii < MAX_BSS_NUM; ii++) {
-               if (pMgmt->sBSSList[ii].bActive == true)
+               if (pMgmt->sBSSList[ii].bActive)
                        break;
        }
 
@@ -2656,7 +2656,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) {
                                        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);
@@ -2677,13 +2677,13 @@ vMgrJoinBSSBegin(
                // ad-hoc mode BSS
                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)) {
                                        // 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)) {
                                        // encryption mode error
                                        pMgmt->eCurrState = WMAC_STATE_IDLE;
                                        return;
@@ -2776,10 +2776,10 @@ s_vMgrSynchBSS(
 
        *pStatus = CMD_STATUS_FAILURE;
 
-       if (s_bCipherMatch(pCurr,
+       if (!s_bCipherMatch(pCurr,
                           pDevice->eEncryptionStatus,
                           &(pMgmt->byCSSPK),
-                          &(pMgmt->byCSSGK)) == false) {
+                          &(pMgmt->byCSSGK))) {
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "s_bCipherMatch Fail .......\n");
                return;
        }
@@ -2869,18 +2869,17 @@ s_vMgrSynchBSS(
                CARDbSetBSSID(pMgmt->pAdapter, pCurr->abyBSSID, OP_MODE_ADHOC);
        }
 
-       if (CARDbSetPhyParameter(pMgmt->pAdapter,
+       if (!CARDbSetPhyParameter(pMgmt->pAdapter,
                                 ePhyType,
                                 pCurr->wCapInfo,
                                 pCurr->sERP.byERP,
                                 pMgmt->abyCurrSuppRates,
-                                pMgmt->abyCurrExtSuppRates
-                   ) != true) {
+                                pMgmt->abyCurrExtSuppRates)) {
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "<----s_bSynchBSS Set Phy Mode Fail [%d]\n", ePhyType);
                return;
        }
        // set channel and clear NAV
-       if (set_channel(pMgmt->pAdapter, pCurr->uChannel) == false) {
+       if (!set_channel(pMgmt->pAdapter, pCurr->uChannel)) {
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "<----s_bSynchBSS Set Channel [%d]\n", pCurr->uChannel);
                return;
        }
@@ -2924,7 +2923,7 @@ static void  Encyption_Rebuild(
 
        if ((pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK) ||           //networkmanager 0.7.0 does not give the pairwise-key selection,
            (pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) {         // so we need re-select it according to real pairwise-key info.
-               if (pCurr->bWPAValid == true)  {   //WPA-PSK
+               if (pCurr->bWPAValid)  {   //WPA-PSK
                        pMgmt->eAuthenMode = WMAC_AUTH_WPAPSK;
                        if (pCurr->abyPKType[0] == WPA_TKIP) {
                                pDevice->eEncryptionStatus = Ndis802_11Encryption2Enabled;    //TKIP
@@ -2933,7 +2932,7 @@ static void  Encyption_Rebuild(
                                pDevice->eEncryptionStatus = Ndis802_11Encryption3Enabled;    //AES
                                PRINT_K("Encyption_Rebuild--->ssid reset config to [WPAPSK-AES]\n");
                        }
-               } else if (pCurr->bWPA2Valid == true) {  //WPA2-PSK
+               } else if (pCurr->bWPA2Valid) {  //WPA2-PSK
                        pMgmt->eAuthenMode = WMAC_AUTH_WPA2PSK;
                        if (pCurr->abyCSSPK[0] == WLAN_11i_CSS_TKIP) {
                                pDevice->eEncryptionStatus = Ndis802_11Encryption2Enabled;     //TKIP
@@ -3150,8 +3149,7 @@ s_MgrMakeBeacon(
                }
        }
 
-       if ((pMgmt->b11hEnable == true) &&
-           (pMgmt->eCurrentPHYMode == PHY_TYPE_11A)) {
+       if (pMgmt->b11hEnable && (pMgmt->eCurrentPHYMode == PHY_TYPE_11A)) {
                // Country IE
                pbyBuffer = (unsigned char *)(sFrame.pBuf + sFrame.len);
                set_country_IE(pMgmt->pAdapter, pbyBuffer);
@@ -3164,7 +3162,7 @@ s_MgrMakeBeacon(
                ((PWLAN_IE_PW_CONST) pbyBuffer)->byPower = 0;
                pbyBuffer += (1) + WLAN_IEHDR_LEN;
                uLength += (1) + WLAN_IEHDR_LEN;
-               if (pMgmt->bSwitchChannel == true) {
+               if (pMgmt->bSwitchChannel) {
                        // Channel Switch IE
                        ((PWLAN_IE_CH_SW) pbyBuffer)->byElementID = WLAN_EID_CH_SWITCH;
                        ((PWLAN_IE_CH_SW) pbyBuffer)->len = 3;
@@ -3193,7 +3191,7 @@ s_MgrMakeBeacon(
                        pbyBuffer += (7) + WLAN_IEHDR_LEN;
                        uLength += (7) + WLAN_IEHDR_LEN;
                        for (ii = CB_MAX_CHANNEL_24G+1; ii <= CB_MAX_CHANNEL; ii++) {
-                               if (get_channel_map_info(pMgmt->pAdapter, ii, pbyBuffer, pbyBuffer+1) == true) {
+                               if (get_channel_map_info(pMgmt->pAdapter, ii, pbyBuffer, pbyBuffer+1)) {
                                        pbyBuffer += 2;
                                        uLength += 2;
                                        pIBSSDFS->len += 2;
@@ -3209,11 +3207,11 @@ s_MgrMakeBeacon(
                sFrame.pERP->byElementID = WLAN_EID_ERP;
                sFrame.pERP->len = 1;
                sFrame.pERP->byContext = 0;
-               if (pDevice->bProtectMode == true)
+               if (pDevice->bProtectMode)
                        sFrame.pERP->byContext |= WLAN_EID_ERP_USE_PROTECTION;
-               if (pDevice->bNonERPPresent == true)
+               if (pDevice->bNonERPPresent)
                        sFrame.pERP->byContext |= WLAN_EID_ERP_NONERP_PRESENT;
-               if (pDevice->bBarkerPreambleMd == true)
+               if (pDevice->bBarkerPreambleMd)
                        sFrame.pERP->byContext |= WLAN_EID_ERP_BARKER_MODE;
        }
        if (((PWLAN_IE_SUPP_RATES)pCurrExtSuppRates)->len != 0) {
@@ -3225,7 +3223,7 @@ s_MgrMakeBeacon(
 );
        }
        // hostapd wpa/wpa2 IE
-       if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) && (pDevice->bEnableHostapd == true)) {
+       if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) && pDevice->bEnableHostapd) {
                if (pMgmt->eAuthenMode == WMAC_AUTH_WPANONE) {
                        if (pMgmt->wWPAIELen != 0) {
                                sFrame.pRSN = (PWLAN_IE_RSN)(sFrame.pBuf + sFrame.len);
@@ -3338,16 +3336,15 @@ s_MgrMakeProbeResponse(
                sFrame.pERP->byElementID = WLAN_EID_ERP;
                sFrame.pERP->len = 1;
                sFrame.pERP->byContext = 0;
-               if (pDevice->bProtectMode == true)
+               if (pDevice->bProtectMode)
                        sFrame.pERP->byContext |= WLAN_EID_ERP_USE_PROTECTION;
-               if (pDevice->bNonERPPresent == true)
+               if (pDevice->bNonERPPresent)
                        sFrame.pERP->byContext |= WLAN_EID_ERP_NONERP_PRESENT;
-               if (pDevice->bBarkerPreambleMd == true)
+               if (pDevice->bBarkerPreambleMd)
                        sFrame.pERP->byContext |= WLAN_EID_ERP_BARKER_MODE;
        }
 
-       if ((pMgmt->b11hEnable == true) &&
-           (pMgmt->eCurrentPHYMode == PHY_TYPE_11A)) {
+       if (pMgmt->b11hEnable && (pMgmt->eCurrentPHYMode == PHY_TYPE_11A)) {
                // Country IE
                pbyBuffer = (unsigned char *)(sFrame.pBuf + sFrame.len);
                set_country_IE(pMgmt->pAdapter, pbyBuffer);
@@ -3360,7 +3357,7 @@ s_MgrMakeProbeResponse(
                ((PWLAN_IE_PW_CONST) pbyBuffer)->byPower = 0;
                pbyBuffer += (1) + WLAN_IEHDR_LEN;
                uLength += (1) + WLAN_IEHDR_LEN;
-               if (pMgmt->bSwitchChannel == true) {
+               if (pMgmt->bSwitchChannel) {
                        // Channel Switch IE
                        ((PWLAN_IE_CH_SW) pbyBuffer)->byElementID = WLAN_EID_CH_SWITCH;
                        ((PWLAN_IE_CH_SW) pbyBuffer)->len = 3;
@@ -3389,7 +3386,7 @@ s_MgrMakeProbeResponse(
                        pbyBuffer += (7) + WLAN_IEHDR_LEN;
                        uLength += (7) + WLAN_IEHDR_LEN;
                        for (ii = CB_MAX_CHANNEL_24G + 1; ii <= CB_MAX_CHANNEL; ii++) {
-                               if (get_channel_map_info(pMgmt->pAdapter, ii, pbyBuffer, pbyBuffer+1) == true) {
+                               if (get_channel_map_info(pMgmt->pAdapter, ii, pbyBuffer, pbyBuffer+1)) {
                                        pbyBuffer += 2;
                                        uLength += 2;
                                        pIBSSDFS->len += 2;
@@ -3409,7 +3406,7 @@ s_MgrMakeProbeResponse(
        }
 
        // hostapd wpa/wpa2 IE
-       if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) && (pDevice->bEnableHostapd == true)) {
+       if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) && pDevice->bEnableHostapd) {
                if (pMgmt->eAuthenMode == WMAC_AUTH_WPANONE) {
                        if (pMgmt->wWPAIELen != 0) {
                                sFrame.pRSN = (PWLAN_IE_RSN)(sFrame.pBuf + sFrame.len);
@@ -3507,7 +3504,7 @@ s_MgrMakeAssocRequest(
        pbyIEs += pCurrRates->len + WLAN_IEHDR_LEN;
 
        // for 802.11h
-       if (pMgmt->b11hEnable == true) {
+       if (pMgmt->b11hEnable) {
                if (sFrame.pCurrPowerCap == NULL) {
                        sFrame.pCurrPowerCap = (PWLAN_IE_PW_CAP)(sFrame.pBuf + sFrame.len);
                        sFrame.len += (2 + WLAN_IEHDR_LEN);
@@ -3650,7 +3647,7 @@ s_MgrMakeAssocRequest(
                sFrame.pRSN->len += 6;
 
                // RSN Capabilities
-               if (pMgmt->pCurrBSS->sRSNCapObj.bRSNCapExist == true) {
+               if (pMgmt->pCurrBSS->sRSNCapObj.bRSNCapExist) {
                        memcpy(&sFrame.pRSN->abyRSN[16], &pMgmt->pCurrBSS->sRSNCapObj.wRSNCap, 2);
                } else {
                        sFrame.pRSN->abyRSN[16] = 0;
@@ -3658,7 +3655,7 @@ s_MgrMakeAssocRequest(
                }
                sFrame.pRSN->len += 2;
 
-               if ((pDevice->gsPMKID.BSSIDInfoCount > 0) && (pDevice->bRoaming == true) && (pMgmt->eAuthenMode == WMAC_AUTH_WPA2)) {
+               if ((pDevice->gsPMKID.BSSIDInfoCount > 0) && pDevice->bRoaming && (pMgmt->eAuthenMode == WMAC_AUTH_WPA2)) {
                        // RSN PMKID
                        pbyRSN = &sFrame.pRSN->abyRSN[18];
                        pwPMKID = (unsigned short *)pbyRSN; // Point to PMKID count
@@ -3896,7 +3893,7 @@ s_MgrMakeReAssocRequest(
                sFrame.pRSN->len += 6;
 
                // RSN Capabilities
-               if (pMgmt->pCurrBSS->sRSNCapObj.bRSNCapExist == true) {
+               if (pMgmt->pCurrBSS->sRSNCapObj.bRSNCapExist) {
                        memcpy(&sFrame.pRSN->abyRSN[16], &pMgmt->pCurrBSS->sRSNCapObj.wRSNCap, 2);
                } else {
                        sFrame.pRSN->abyRSN[16] = 0;
@@ -3904,7 +3901,7 @@ s_MgrMakeReAssocRequest(
                }
                sFrame.pRSN->len += 2;
 
-               if ((pDevice->gsPMKID.BSSIDInfoCount > 0) && (pDevice->bRoaming == true) && (pMgmt->eAuthenMode == WMAC_AUTH_WPA2)) {
+               if ((pDevice->gsPMKID.BSSIDInfoCount > 0) && pDevice->bRoaming && (pMgmt->eAuthenMode == WMAC_AUTH_WPA2)) {
                        // RSN PMKID
                        pbyRSN = &sFrame.pRSN->abyRSN[18];
                        pwPMKID = (unsigned short *)pbyRSN; // Point to PMKID count
@@ -4141,7 +4138,7 @@ s_vMgrRxProbeResponse(
        }
 
 //2008-0730-01<Add>by MikeLiu
-       if (ChannelExceedZoneType(pDevice, byCurrChannel) == true)
+       if (ChannelExceedZoneType(pDevice, byCurrChannel))
                return;
 
        if (sFrame.pERP != NULL) {
@@ -4578,7 +4575,7 @@ bAdd_PMKID_Candidate(
        for (ii = 0; ii < pDevice->gsPMKIDCandidate.NumCandidates; ii++) {
                pCandidateList = &pDevice->gsPMKIDCandidate.CandidateList[ii];
                if (!memcmp(pCandidateList->BSSID, pbyBSSID, ETH_ALEN)) {
-                       if ((psRSNCapObj->bRSNCapExist == true) && (psRSNCapObj->wRSNCap & BIT0)) {
+                       if (psRSNCapObj->bRSNCapExist && (psRSNCapObj->wRSNCap & BIT0)) {
                                pCandidateList->Flags |= NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED;
                        } else {
                                pCandidateList->Flags &= ~(NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED);
@@ -4589,7 +4586,7 @@ bAdd_PMKID_Candidate(
 
        // New Candidate
        pCandidateList = &pDevice->gsPMKIDCandidate.CandidateList[pDevice->gsPMKIDCandidate.NumCandidates];
-       if ((psRSNCapObj->bRSNCapExist == true) && (psRSNCapObj->wRSNCap & BIT0)) {
+       if (psRSNCapObj->bRSNCapExist && (psRSNCapObj->wRSNCap & BIT0)) {
                pCandidateList->Flags |= NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED;
        } else {
                pCandidateList->Flags &= ~(NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED);
@@ -4650,7 +4647,7 @@ s_bCipherMatch(
        }
 
        if ((WLAN_GET_CAP_INFO_PRIVACY(pBSSNode->wCapInfo) != 0) &&
-           (pBSSNode->bWPA2Valid == true) &&
+           pBSSNode->bWPA2Valid &&
            //20080123-01,<Add> by Einsn Liu
            ((EncStatus == Ndis802_11Encryption3Enabled) || (EncStatus == Ndis802_11Encryption2Enabled))) {
                //WPA2
@@ -4684,7 +4681,7 @@ s_bCipherMatch(
                }
 
        } else if ((WLAN_GET_CAP_INFO_PRIVACY(pBSSNode->wCapInfo) != 0) &&
-                  (pBSSNode->bWPAValid == true) &&
+                  pBSSNode->bWPAValid &&
                   ((EncStatus == Ndis802_11Encryption3Enabled) || (EncStatus == Ndis802_11Encryption2Enabled))) {
                //WPA
                // check Group Key Cipher

diff --git a/drivers/staging/vt6655/wpa.c b/drivers/staging/vt6655/wpa.c
index b697fa6c3b16af995f1af746529b478c6e0df7bf..990ea0f9e9fbfd07930c681d0e2da14c94d18d86 100644 (file)
--- a/drivers/staging/vt6655/wpa.c
+++ b/drivers/staging/vt6655/wpa.c
@@ -241,7 +241,7 @@ WPA_SearchRSN(
        int ii;
        unsigned char byPKType = WPA_NONE;
 
-       if (pBSSList->bWPAValid == false)
+       if (!pBSSList->bWPAValid)
                return false;
 
        switch (byCmd) {

diff --git a/drivers/staging/vt6655/wpa2.c b/drivers/staging/vt6655/wpa2.c
index a7e33c0ceb744d22936236a6ab259041b8e99d94..2013122e92b26ca38e04054fc53a41d2e282e7f1 100644 (file)
--- a/drivers/staging/vt6655/wpa2.c
+++ b/drivers/staging/vt6655/wpa2.c
@@ -192,7 +192,7 @@ WPA2vParseRSN(
                                        break;
                        } //for
 
-                       if (bUseGK == true) {
+                       if (bUseGK) {
                                if (j != 1) {
                                        // invalid CSS, This should be only PK CSS.
                                        return;
@@ -335,7 +335,7 @@ WPA2uSetIEs(
                pRSNIEs->len += 2;
 
                if ((pMgmt->gsPMKIDCache.BSSIDInfoCount > 0) &&
-                   (pMgmt->bRoaming == true) &&
+                   pMgmt->bRoaming &&
                    (pMgmt->eAuthenMode == WMAC_AUTH_WPA2)) {
                        // RSN PMKID
                        pwPMKID = (unsigned short *)(&pRSNIEs->abyRSN[18]);  // Point to PMKID count

diff --git a/drivers/staging/vt6655/wpactl.c b/drivers/staging/vt6655/wpactl.c
index 044368a46c53f332d45f9387722563143139c468..ee83704e440139d2c0d713512ef3e864584eec20 100644 (file)
--- a/drivers/staging/vt6655/wpactl.c
+++ b/drivers/staging/vt6655/wpactl.c
@@ -341,22 +341,22 @@ int wpa_set_keys(PSDevice pDevice, void *ctx, bool fcpfkernel)
                // If is_broadcast_ether_addr, set the key as every key entry's group key.
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Groupe Key Assign.\n");
 
-               if ((KeybSetAllGroupKey(&(pDevice->sKey),
+               if (KeybSetAllGroupKey(&(pDevice->sKey),
                                        dwKeyIndex,
                                        param->u.wpa_key.key_len,
                                        (PQWORD) &(KeyRSC),
                                        (unsigned char *)abyKey,
                                        byKeyDecMode,
                                        pDevice->PortOffset,
-                                       pDevice->byLocalID) == true) &&
-                   (KeybSetDefaultKey(&(pDevice->sKey),
+                                       pDevice->byLocalID) &&
+                   KeybSetDefaultKey(&(pDevice->sKey),
                                       dwKeyIndex,
                                       param->u.wpa_key.key_len,
                                       (PQWORD) &(KeyRSC),
                                       (unsigned char *)abyKey,
                                       byKeyDecMode,
                                       pDevice->PortOffset,
-                                      pDevice->byLocalID) == true)) {
+                                      pDevice->byLocalID)) {
                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "GROUP Key Assign.\n");
 
                } else {
@@ -389,7 +389,7 @@ int wpa_set_keys(PSDevice pDevice, void *ctx, bool fcpfkernel)
                               (unsigned char *)abyKey,
                               byKeyDecMode,
                               pDevice->PortOffset,
-                              pDevice->byLocalID) == true) {
+                              pDevice->byLocalID)) {
                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Pairwise Key Set\n");
 
                } else {
@@ -804,7 +804,7 @@ static int wpa_set_associate(PSDevice pDevice,
        else
                pDevice->bEncryptionEnable = false;
        if (!((pMgmt->eAuthenMode == WMAC_AUTH_SHAREKEY) ||
-             ((pMgmt->eAuthenMode == WMAC_AUTH_OPEN) && (bWepEnabled == true))))  //DavidWang  //20080717-06,<Modify> by chester//Not to initial WEP
+             ((pMgmt->eAuthenMode == WMAC_AUTH_OPEN) && bWepEnabled)))  //DavidWang  //20080717-06,<Modify> by chester//Not to initial WEP
                KeyvInitTable(&pDevice->sKey, pDevice->PortOffset);
        spin_lock_irq(&pDevice->lock);
        pDevice->bLinkPass = false;