From c98323a7da3cf3625c37743974d007a1fe6539a5 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Sun, 10 Aug 2014 12:21:57 +0100 Subject: [PATCH] staging: vt6655: BSSvSecondTxData remove #if 1 else directive There is a code alignment error after this directive realign code Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/wcmd.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c index 16ed097b1467..b7e68a08a8a0 100644 --- a/drivers/staging/vt6655/wcmd.c +++ b/drivers/staging/vt6655/wcmd.c @@ -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); +} -- 2.39.5