]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
staging: vt6656: added spaces around '||'
authorAndres More <more.andres@gmail.com>
Tue, 3 Aug 2010 02:35:57 +0000 (23:35 -0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 31 Aug 2010 18:13:56 +0000 (11:13 -0700)
Cleared checkpatch ERROR: spaces required around that '||'

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/vt6656/dpc.c
drivers/staging/vt6656/iwctl.c
drivers/staging/vt6656/rxtx.c
drivers/staging/vt6656/wmgr.c

index 5e88349d3b95b064f602cb9b7fc2ad5dc3012586..7e794a207aed239919c166c487e430290a591af2 100644 (file)
@@ -377,9 +377,9 @@ RXbBulkInProcessData (
         return FALSE;
     }
 
-    if ((BytesToIndicate > 2372)||(BytesToIndicate <= 40)) {
+    if ((BytesToIndicate > 2372) || (BytesToIndicate <= 40)) {
         // Frame Size error drop this packet.
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---------- WRONG Length 2 \n");
+       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "---------- WRONG Length 2\n");
         return FALSE;
     }
 
index 016b8e7766f39820ac7883b950f4cf4d7631acc5..3922a81d30dbcbf8365eb48bd2ece4333d9c560f 100644 (file)
@@ -1598,7 +1598,8 @@ int iwctl_siwauth(struct net_device *dev,
                        pDevice->eEncryptionStatus = Ndis802_11Encryption3Enabled;
                }else if(pairwise == IW_AUTH_CIPHER_TKIP){
                        pDevice->eEncryptionStatus = Ndis802_11Encryption2Enabled;
-               }else if(pairwise == IW_AUTH_CIPHER_WEP40||pairwise == IW_AUTH_CIPHER_WEP104){
+               } else if (pairwise == IW_AUTH_CIPHER_WEP40 ||
+                          pairwise == IW_AUTH_CIPHER_WEP104) {
                        pDevice->eEncryptionStatus = Ndis802_11Encryption1Enabled;
                }else if(pairwise == IW_AUTH_CIPHER_NONE){
                        //do nothing,einsn liu
index deca2137d921e2b4185a92fdc1f5d2cf44b1a0b9..e30077e6e1083557b432c54ac20c3b6882fadbb8 100644 (file)
@@ -841,8 +841,8 @@ s_uFillDataHead (
     }
 
     if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
-        if((uDMAIdx==TYPE_ATIMDMA)||(uDMAIdx==TYPE_BEACONDMA)) {
-            PSTxDataHead_ab pBuf = (PSTxDataHead_ab)pTxDataHead;
+       if ((uDMAIdx == TYPE_ATIMDMA) || (uDMAIdx == TYPE_BEACONDMA)) {
+               PSTxDataHead_ab pBuf = (PSTxDataHead_ab) pTxDataHead;
             //Get SignalField,ServiceField,Length
             BBvCaculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,
                 (PWORD)&(pBuf->wTransmitLength), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField)
index e4eca9b060b1fb37a5d16fa624589a0cdadecba5..f70e13bdfe6c88cee5ed99ec2c1fb42391fa840d 100644 (file)
@@ -2638,8 +2638,9 @@ void vMgrJoinBSSBegin(void *hDeviceContext, PCMD_STATUS pStatus)
 
     if (WLAN_GET_CAP_INFO_ESS(cpu_to_le16(pCurr->wCapInfo))){
 
-        if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA)||(pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK)) {
-/*
+       if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA) ||
+           (pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK)) {
+               /*
             if (pDevice->eEncryptionStatus == Ndis802_11Encryption2Enabled) {
                 if (WPA_SearchRSN(0, WPA_TKIP, pCurr) == FALSE) {
                     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"No match RSN info. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n");
@@ -4768,7 +4769,8 @@ s_bCipherMatch (
     if ((WLAN_GET_CAP_INFO_PRIVACY(pBSSNode->wCapInfo) != 0) &&
         (pBSSNode->bWPA2Valid == TRUE) &&
           //20080123-01,<Add> by Einsn Liu
-        ((EncStatus == Ndis802_11Encryption3Enabled)||(EncStatus == Ndis802_11Encryption2Enabled))) {
+       ((EncStatus == Ndis802_11Encryption3Enabled) ||
+        (EncStatus == Ndis802_11Encryption2Enabled))) {
         //WPA2
         // check Group Key Cipher
         if ((pBSSNode->byCSSGK == WLAN_11i_CSS_WEP40) ||