iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: vt6656: removed TxInSleep definition

Browse Source 
Removed an always defined macro, perhaps used to patch the driver

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Andres More 2010-06-25 20:20:58 -03:00 committed by Greg Kroah-Hartman
parent 3adb149d2b
commit feaf03d3b4
8 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/vt6656/device.h
View File

@ -794,13 +794,10 @@ typedef struct __device_info {
// command timer // command timer
struct timer_list sTimerCommand; struct timer_list sTimerCommand;
//2007-0115-01<Add>by MikeLiu
#ifdef TxInSleep
struct timer_list sTimerTxData; struct timer_list sTimerTxData;
unsigned long nTxDataTimeCout; unsigned long nTxDataTimeCout;
BOOL fTxDataInSleep; BOOL fTxDataInSleep;
BOOL IsTxDataTrigger; BOOL IsTxDataTrigger;
#endif
#ifdef WPA_SM_Transtatus #ifdef WPA_SM_Transtatus
BOOL fWPA_Authened; //is WPA/WPA-PSK or WPA2/WPA2-PSK authen?? BOOL fWPA_Authened; //is WPA/WPA-PSK or WPA2/WPA2-PSK authen??

3
drivers/staging/vt6656/main_usb.c
View File

@ -1239,10 +1239,7 @@ device_release_WPADEV(pDevice);
del_timer(&pDevice->sTimerCommand); del_timer(&pDevice->sTimerCommand);
del_timer(&pMgmt->sTimerSecondCallback); del_timer(&pMgmt->sTimerSecondCallback);
//2007-0115-02<Add>by MikeLiu
#ifdef TxInSleep
del_timer(&pDevice->sTimerTxData); del_timer(&pDevice->sTimerTxData);
#endif
if (pDevice->bDiversityRegCtlON) { if (pDevice->bDiversityRegCtlON) {
del_timer(&pDevice->TimerSQ3Tmax1); del_timer(&pDevice->TimerSQ3Tmax1);

8
drivers/staging/vt6656/power.c
View File

@ -290,17 +290,11 @@ BOOL PSbSendNullPacket(void *hDeviceContext)
return FALSE; return FALSE;
} }
//2007-0115-03<Add>by MikeLiu
#ifdef TxInSleep
if ((pDevice->bEnablePSMode == FALSE) && if ((pDevice->bEnablePSMode == FALSE) &&
(pDevice->fTxDataInSleep == FALSE)){ (pDevice->fTxDataInSleep == FALSE)){
return FALSE; return FALSE;
} }
#else
if (pDevice->bEnablePSMode == FALSE) {
return FALSE;
}
#endif
memset(pMgmt->pbyPSPacketPool, 0, sizeof(STxMgmtPacket) + WLAN_NULLDATA_FR_MAXLEN); memset(pMgmt->pbyPSPacketPool, 0, sizeof(STxMgmtPacket) + WLAN_NULLDATA_FR_MAXLEN);
pTxPacket = (PSTxMgmtPacket)pMgmt->pbyPSPacketPool; pTxPacket = (PSTxMgmtPacket)pMgmt->pbyPSPacketPool;
pTxPacket->p80211Header = (PUWLAN_80211HDR)((PBYTE)pTxPacket + sizeof(STxMgmtPacket)); pTxPacket->p80211Header = (PUWLAN_80211HDR)((PBYTE)pTxPacket + sizeof(STxMgmtPacket));

7
drivers/staging/vt6656/ttype.h
View File

@ -31,13 +31,6 @@
/******* Common definitions and typedefs ***********************************/ /******* Common definitions and typedefs ***********************************/
//2007-0115-05<Add>by MikeLiu
#ifndef TxInSleep
#define TxInSleep
#endif
//DavidWang
//2007-0814-01<Add>by MikeLiu //2007-0814-01<Add>by MikeLiu
#ifndef Safe_Close #ifndef Safe_Close
#define Safe_Close #define Safe_Close

5
drivers/staging/vt6656/usbpipe.c
View File

@ -784,10 +784,7 @@ s_nsBulkOutIoCompleteWrite(
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Write %d bytes\n",(int)ulBufLen); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Write %d bytes\n",(int)ulBufLen);
pDevice->ulBulkOutBytesWrite += ulBufLen; pDevice->ulBulkOutBytesWrite += ulBufLen;
pDevice->ulBulkOutContCRCError = 0; pDevice->ulBulkOutContCRCError = 0;
//2007-0115-06<Add>by MikeLiu pDevice->nTxDataTimeCout = 0;
#ifdef TxInSleep
pDevice->nTxDataTimeCout = 0;
#endif
} else { } else {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BULK Out failed %d\n", status); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BULK Out failed %d\n", status);

7
drivers/staging/vt6656/wcmd.c
View File

@ -742,8 +742,6 @@ void vRunCommand(void *hDeviceContext)
netif_wake_queue(pDevice->dev); netif_wake_queue(pDevice->dev);
} }
//2007-0115-07<Add>by MikeLiu
#ifdef TxInSleep
if(pDevice->IsTxDataTrigger != FALSE) { //TxDataTimer is not triggered at the first time if(pDevice->IsTxDataTrigger != FALSE) { //TxDataTimer is not triggered at the first time
// printk("Re-initial TxDataTimer****\n"); // printk("Re-initial TxDataTimer****\n");
del_timer(&pDevice->sTimerTxData); del_timer(&pDevice->sTimerTxData);
@ -759,7 +757,6 @@ void vRunCommand(void *hDeviceContext)
} }
pDevice->IsTxDataTrigger = TRUE; pDevice->IsTxDataTrigger = TRUE;
add_timer(&pDevice->sTimerTxData); add_timer(&pDevice->sTimerTxData);
#endif
} }
else if(pMgmt->eCurrState < WMAC_STATE_ASSOCPENDING) { else if(pMgmt->eCurrState < WMAC_STATE_ASSOCPENDING) {
@ -1276,8 +1273,6 @@ void vResetCommandTimer(void *hDeviceContext)
pDevice->bCmdClear = FALSE; pDevice->bCmdClear = FALSE;
} }
//2007-0115-08<Add>by MikeLiu
#ifdef TxInSleep
void BSSvSecondTxData(void *hDeviceContext) void BSSvSecondTxData(void *hDeviceContext)
{ {
PSDevice pDevice = (PSDevice)hDeviceContext; PSDevice pDevice = (PSDevice)hDeviceContext;
@ -1313,5 +1308,3 @@ void BSSvSecondTxData(void *hDeviceContext)
add_timer(&pDevice->sTimerTxData); add_timer(&pDevice->sTimerTxData);
return; return;
} }
#endif

3
drivers/staging/vt6656/wcmd.h
View File

@ -128,9 +128,6 @@ WCMDvCommandThread(
); );
*/ */
//2007-0115-09<Add>by MikeLiu
#ifdef TxInSleep
void BSSvSecondTxData(void *hDeviceContext); void BSSvSecondTxData(void *hDeviceContext);
#endif
#endif /* __WCMD_H__ */ #endif /* __WCMD_H__ */

3
drivers/staging/vt6656/wmgr.c
View File

@ -373,8 +373,6 @@ void vMgrObjectInit(void *hDeviceContext)
pDevice->sTimerCommand.function = (TimerFunction)vRunCommand; pDevice->sTimerCommand.function = (TimerFunction)vRunCommand;
pDevice->sTimerCommand.expires = RUN_AT(HZ); pDevice->sTimerCommand.expires = RUN_AT(HZ);
//2007-0115-10<Add>by MikeLiu
#ifdef TxInSleep
init_timer(&pDevice->sTimerTxData); init_timer(&pDevice->sTimerTxData);
pDevice->sTimerTxData.data = (unsigned long)pDevice; pDevice->sTimerTxData.data = (unsigned long)pDevice;
pDevice->sTimerTxData.function = (TimerFunction)BSSvSecondTxData; pDevice->sTimerTxData.function = (TimerFunction)BSSvSecondTxData;
@ -382,7 +380,6 @@ void vMgrObjectInit(void *hDeviceContext)
pDevice->fTxDataInSleep = FALSE; pDevice->fTxDataInSleep = FALSE;
pDevice->IsTxDataTrigger = FALSE; pDevice->IsTxDataTrigger = FALSE;
pDevice->nTxDataTimeCout = 0; pDevice->nTxDataTimeCout = 0;
#endif
pDevice->cbFreeCmdQueue = CMD_Q_SIZE; pDevice->cbFreeCmdQueue = CMD_Q_SIZE;
pDevice->uCmdDequeueIdx = 0; pDevice->uCmdDequeueIdx = 0;