]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: vt6655: BSSvSecondTxData remove #if 1 else directive
authorMalcolm Priestley <tvboxspy@gmail.com>
Sun, 10 Aug 2014 11:21:57 +0000 (12:21 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 16 Aug 2014 19:23:15 +0000 (12:23 -0700)
There is a code alignment error after this directive realign
code

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6655/wcmd.c

index 16ed097b1467b335339ae389166b182992054517..b7e68a08a8a015af4209a93df62d77ecae79cb1e 100644 (file)
@@ -1001,19 +1001,17 @@ BSSvSecondTxData(
        }
 
        spin_lock_irq(&pDevice->lock);
-#if 1
-       if ((pDevice->bLinkPass && (pMgmt->eAuthenMode < WMAC_AUTH_WPA)) ||  //open && sharekey linking
-           pDevice->fWPA_Authened) {   //wpa linking
-#else
-               if (pDevice->bLinkPass == true) {
-#endif
-                       pDevice->fTxDataInSleep = true;
-                       PSbSendNullPacket(pDevice);      //send null packet
-                       pDevice->fTxDataInSleep = false;
-               }
-               spin_unlock_irq(&pDevice->lock);
 
-               pDevice->sTimerTxData.expires = RUN_AT(10*HZ);      //10s callback
-               add_timer(&pDevice->sTimerTxData);
-               return;
+       /* open && sharekey linking */
+       if ((pDevice->bLinkPass && (pMgmt->eAuthenMode < WMAC_AUTH_WPA)) ||
+           pDevice->fWPA_Authened) {   /* wpa linking */
+               pDevice->fTxDataInSleep = true;
+               PSbSendNullPacket(pDevice);     /* send null packet */
+               pDevice->fTxDataInSleep = false;
        }
+
+       spin_unlock_irq(&pDevice->lock);
+
+       pDevice->sTimerTxData.expires = RUN_AT(10*HZ); /* 10s callback */
+       add_timer(&pDevice->sTimerTxData);
+}