Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2af99ee authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: Remove TxInSleep macro 



TxInSleep is always enabled remove the macro and any
else code.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 11a72e5e

drivers/staging/vt6655/device.h

+0 −2
Original line number Diff line number Diff line
@@ -643,12 +643,10 @@ typedef struct __device_info { 


	// command timer

	struct timer_list       sTimerCommand;

#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??

drivers/staging/vt6655/device_main.c

+2 −4
Original line number Diff line number Diff line
@@ -1720,9 +1720,8 @@ static int device_close(struct net_device *dev) 
		bScheduleCommand((void *)pDevice, WLAN_CMD_DISASSOCIATE, NULL);

		mdelay(30);

	}

#ifdef TxInSleep



	del_timer(&pDevice->sTimerTxData);

#endif

	del_timer(&pDevice->sTimerCommand);

	del_timer(&pMgmt->sTimerSecondCallback);

	if (pDevice->bDiversityRegCtlON) {
@@ -2232,9 +2231,8 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) 
	pLastTD->pTDInfo->skb = skb;

	pLastTD->pTDInfo->byFlags = 0;

	pLastTD->pTDInfo->byFlags |= TD_FLAGS_NETIF_SKB;

#ifdef TxInSleep

	pDevice->nTxDataTimeCout = 0; //2008-8-21 chester <add> for send null packet

#endif



	if (AVAIL_TD(pDevice, TYPE_AC0DMA) <= 1)

		netif_stop_queue(dev);

drivers/staging/vt6655/power.c

+1 −5
Original line number Diff line number Diff line
@@ -274,13 +274,9 @@ PSbSendNullPacket( 
	if (!pDevice->bLinkPass)

		return false;



#ifdef TxInSleep

	if (!pDevice->bEnablePSMode && !pDevice->fTxDataInSleep)

		return false;

#else

	if (!pDevice->bEnablePSMode)

		return false;

#endif



	if (pDevice->bEnablePSMode) {

		for (uIdx = 0; uIdx < TYPE_MAXTD; uIdx++) {

			if (pDevice->iTDUsed[uIdx] != 0)

drivers/staging/vt6655/rxtx.c

+0 −2
Original line number Diff line number Diff line
@@ -2326,9 +2326,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) 


	pDevice->apCurrTD[TYPE_TXDMA0] = pFrstTD->next;



#ifdef TxInSleep

	pDevice->nTxDataTimeCout = 0; //2008-8-21 chester <add> for send null packet

#endif



	// Poll Transmit the adapter

	MACvTransmit0(pDevice->PortOffset);

drivers/staging/vt6655/ttype.h

+0 −4
Original line number Diff line number Diff line
@@ -31,10 +31,6 @@ 


/******* Common definitions and typedefs ***********************************/



#ifndef TxInSleep

#define TxInSleep

#endif



#ifndef WPA_SM_Transtatus

#define WPA_SM_Transtatus

#endif