Commit feaf03d3 authored Jun 25, 2010 by Andres More Committed by Greg Kroah-Hartman Jul 08, 2010

staging: vt6656: removed TxInSleep definition



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>

parent 3adb149d

drivers/staging/vt6656/device.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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??

drivers/staging/vt6656/main_usb.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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);

drivers/staging/vt6656/power.c

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -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));

drivers/staging/vt6656/ttype.h

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -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

drivers/staging/vt6656/usbpipe.c

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -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
	#ifdef TxInSleep
	pDevice->nTxDataTimeCout = 0;		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);