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

Commit 73dbd9f3 authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Remove unused code to detect struct tx rings 



Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ea9dc54e

drivers/staging/rtl8192e/r8192E.h

+0 −24
Original line number Diff line number Diff line
@@ -1031,30 +1031,6 @@ typedef struct r8192_priv 
	int txbeaconcount;

	struct buffer *txbeaconbufs;

	struct buffer *txbeaconbufstail;

	ptx_ring txmapring;

	ptx_ring txbkpring;

	ptx_ring txbepring;

	ptx_ring txvipring;

	ptx_ring txvopring;

	ptx_ring txcmdring;

	ptx_ring txmapringtail;

	ptx_ring txbkpringtail;

	ptx_ring txbepringtail;

	ptx_ring txvipringtail;

	ptx_ring txvopringtail;

	ptx_ring txcmdringtail;

	ptx_ring txmapringhead;

	ptx_ring txbkpringhead;

	ptx_ring txbepringhead;

	ptx_ring txvipringhead;

	ptx_ring txvopringhead;

	ptx_ring txcmdringhead;

	dma_addr_t txmapringdma;

	dma_addr_t txbkpringdma;

	dma_addr_t txbepringdma;

	dma_addr_t txvipringdma;

	dma_addr_t txvopringdma;

	dma_addr_t txcmdringdma;

	//	u8 chtxpwr[15]; //channels from 1 to 14, 0 not used

//	u8 chtxpwr_ofdm[15]; //channels from 1 to 14, 0 not used

//	u8 cck_txpwr_base;

drivers/staging/rtl8192e/r8192E_core.c

+0 −57
Original line number Diff line number Diff line
@@ -3555,8 +3555,6 @@ static RESET_TYPE 
TxCheckStuck(struct net_device *dev)

{

	struct r8192_priv *priv = ieee80211_priv(dev);

	u8			QueueID;

	ptx_ring		head=NULL,tail=NULL,txring = NULL;

	u8			ResetThreshold = NIC_SEND_HANG_THRESHOLD_POWERSAVE;

	bool			bCheckFwTxCnt = false;
@@ -3577,61 +3575,6 @@ TxCheckStuck(struct net_device *dev) 
			break;

	}



	//

	// Check whether specific tcb has been queued for a specific time

	//

	for(QueueID = 0; QueueID < MAX_TX_QUEUE; QueueID++)

	{





		if(QueueID == TXCMD_QUEUE)

			continue;



		switch(QueueID) {

		case MGNT_QUEUE:

			tail=priv->txmapringtail;

			head=priv->txmapringhead;

			break;



		case BK_QUEUE:

			tail=priv->txbkpringtail;

			head=priv->txbkpringhead;

			break;



		case BE_QUEUE:

			tail=priv->txbepringtail;

			head=priv->txbepringhead;

			break;



		case VI_QUEUE:

			tail=priv->txvipringtail;

			head=priv->txvipringhead;

			break;



		case VO_QUEUE:

			tail=priv->txvopringtail;

			head=priv->txvopringhead;

			break;



		default:

			tail=head=NULL;

			break;

		}



		if(tail == head)

			continue;

		else

		{

			txring = head;

			if(txring == NULL)

			{

				RT_TRACE(COMP_ERR,"%s():txring is NULL , BUG!\n",__FUNCTION__);

				continue;

			}

			txring->nStuckCount++;

			bCheckFwTxCnt = TRUE;

		}

	}

#if 1

	if(bCheckFwTxCnt)

	{