From feaf03d3b42290f4c275ebf11641759bf4e1c458 Mon Sep 17 00:00:00 2001 From: Andres More Date: Fri, 25 Jun 2010 20:20:58 -0300 Subject: [PATCH] staging: vt6656: removed TxInSleep definition Removed an always defined macro, perhaps used to patch the driver Signed-off-by: Andres More Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/device.h | 3 --- drivers/staging/vt6656/main_usb.c | 3 --- drivers/staging/vt6656/power.c | 8 +------- drivers/staging/vt6656/ttype.h | 7 ------- drivers/staging/vt6656/usbpipe.c | 5 +---- drivers/staging/vt6656/wcmd.c | 7 ------- drivers/staging/vt6656/wcmd.h | 3 --- drivers/staging/vt6656/wmgr.c | 3 --- 8 files changed, 2 insertions(+), 37 deletions(-) diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index 0bd8a9d21c16..628a96948774 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -794,13 +794,10 @@ typedef struct __device_info { // command timer struct timer_list sTimerCommand; -//2007-0115-01by MikeLiu -#ifdef TxInSleep struct timer_list sTimerTxData; unsigned long nTxDataTimeCout; BOOL fTxDataInSleep; BOOL IsTxDataTrigger; -#endif #ifdef WPA_SM_Transtatus BOOL fWPA_Authened; //is WPA/WPA-PSK or WPA2/WPA2-PSK authen?? diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 6a04245e9ed3..5dbd61d0c701 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -1239,10 +1239,7 @@ device_release_WPADEV(pDevice); del_timer(&pDevice->sTimerCommand); del_timer(&pMgmt->sTimerSecondCallback); -//2007-0115-02by MikeLiu -#ifdef TxInSleep del_timer(&pDevice->sTimerTxData); -#endif if (pDevice->bDiversityRegCtlON) { del_timer(&pDevice->TimerSQ3Tmax1); diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c index 5ff15bf59c5b..4d7d4e014d00 100644 --- a/drivers/staging/vt6656/power.c +++ b/drivers/staging/vt6656/power.c @@ -290,17 +290,11 @@ BOOL PSbSendNullPacket(void *hDeviceContext) return FALSE; } -//2007-0115-03by MikeLiu -#ifdef TxInSleep if ((pDevice->bEnablePSMode == FALSE) && (pDevice->fTxDataInSleep == FALSE)){ return FALSE; } -#else - if (pDevice->bEnablePSMode == FALSE) { - return FALSE; - } -#endif + memset(pMgmt->pbyPSPacketPool, 0, sizeof(STxMgmtPacket) + WLAN_NULLDATA_FR_MAXLEN); pTxPacket = (PSTxMgmtPacket)pMgmt->pbyPSPacketPool; pTxPacket->p80211Header = (PUWLAN_80211HDR)((PBYTE)pTxPacket + sizeof(STxMgmtPacket)); diff --git a/drivers/staging/vt6656/ttype.h b/drivers/staging/vt6656/ttype.h index 3ffcd7f790de..342577314c3b 100644 --- a/drivers/staging/vt6656/ttype.h +++ b/drivers/staging/vt6656/ttype.h @@ -31,13 +31,6 @@ /******* Common definitions and typedefs ***********************************/ -//2007-0115-05by MikeLiu -#ifndef TxInSleep -#define TxInSleep -#endif - -//DavidWang - //2007-0814-01by MikeLiu #ifndef Safe_Close #define Safe_Close diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index e1d41023c480..8c7b3afe44ad 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -784,10 +784,7 @@ s_nsBulkOutIoCompleteWrite( DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Write %d bytes\n",(int)ulBufLen); pDevice->ulBulkOutBytesWrite += ulBufLen; pDevice->ulBulkOutContCRCError = 0; - //2007-0115-06by MikeLiu - #ifdef TxInSleep - pDevice->nTxDataTimeCout = 0; - #endif + pDevice->nTxDataTimeCout = 0; } else { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BULK Out failed %d\n", status); diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index 7199f99a8b28..ec1c05794d83 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c @@ -742,8 +742,6 @@ void vRunCommand(void *hDeviceContext) netif_wake_queue(pDevice->dev); } - //2007-0115-07by MikeLiu - #ifdef TxInSleep if(pDevice->IsTxDataTrigger != FALSE) { //TxDataTimer is not triggered at the first time // printk("Re-initial TxDataTimer****\n"); del_timer(&pDevice->sTimerTxData); @@ -759,7 +757,6 @@ void vRunCommand(void *hDeviceContext) } pDevice->IsTxDataTrigger = TRUE; add_timer(&pDevice->sTimerTxData); - #endif } else if(pMgmt->eCurrState < WMAC_STATE_ASSOCPENDING) { @@ -1276,8 +1273,6 @@ void vResetCommandTimer(void *hDeviceContext) pDevice->bCmdClear = FALSE; } -//2007-0115-08by MikeLiu -#ifdef TxInSleep void BSSvSecondTxData(void *hDeviceContext) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -1313,5 +1308,3 @@ void BSSvSecondTxData(void *hDeviceContext) add_timer(&pDevice->sTimerTxData); return; } -#endif - diff --git a/drivers/staging/vt6656/wcmd.h b/drivers/staging/vt6656/wcmd.h index 09c4411c6891..d24a79dce61a 100644 --- a/drivers/staging/vt6656/wcmd.h +++ b/drivers/staging/vt6656/wcmd.h @@ -128,9 +128,6 @@ WCMDvCommandThread( ); */ -//2007-0115-09by MikeLiu -#ifdef TxInSleep void BSSvSecondTxData(void *hDeviceContext); -#endif #endif /* __WCMD_H__ */ diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c index 9d8eda906bf8..c84b78832733 100644 --- a/drivers/staging/vt6656/wmgr.c +++ b/drivers/staging/vt6656/wmgr.c @@ -373,8 +373,6 @@ void vMgrObjectInit(void *hDeviceContext) pDevice->sTimerCommand.function = (TimerFunction)vRunCommand; pDevice->sTimerCommand.expires = RUN_AT(HZ); -//2007-0115-10by MikeLiu - #ifdef TxInSleep init_timer(&pDevice->sTimerTxData); pDevice->sTimerTxData.data = (unsigned long)pDevice; pDevice->sTimerTxData.function = (TimerFunction)BSSvSecondTxData; @@ -382,7 +380,6 @@ void vMgrObjectInit(void *hDeviceContext) pDevice->fTxDataInSleep = FALSE; pDevice->IsTxDataTrigger = FALSE; pDevice->nTxDataTimeCout = 0; - #endif pDevice->cbFreeCmdQueue = CMD_Q_SIZE; pDevice->uCmdDequeueIdx = 0;