summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McCormack <mikem@ring3k.org>2011-01-24 23:16:30 +0900
committerGreg Kroah-Hartman <gregkh@suse.de>2011-01-25 06:34:40 +0800
commit73dbd9f3a4d3c47f514fda5997322f2cbb8219e3 (patch)
treeda6b86a36d15e939a7e8bcd9b98d76dbb5367e97
parentea9dc54ed9efc32f0cf2c6eb18898cfd8a1bb96e (diff)
downloadop-kernel-dev-73dbd9f3a4d3c47f514fda5997322f2cbb8219e3.zip
op-kernel-dev-73dbd9f3a4d3c47f514fda5997322f2cbb8219e3.tar.gz
staging: rtl8192e: Remove unused code to detect struct tx rings
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/rtl8192e/r8192E.h24
-rw-r--r--drivers/staging/rtl8192e/r8192E_core.c57
2 files changed, 0 insertions, 81 deletions
diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h
index a93b0ee..2fa25ad 100644
--- a/drivers/staging/rtl8192e/r8192E.h
+++ b/drivers/staging/rtl8192e/r8192E.h
@@ -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;
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index 80a0e1f..cf5d828 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -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)
{
OpenPOWER on IntegriCloud