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>

diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h
index a93b0eeaf90f2340d380946d084a10237bfd6903..2fa25adff987bb617e57c8c0ff66c32226951a92 100644 (file)
--- 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 80a0e1f0ecbffe7a5cb1c9a03a1ca6da1a075a56..cf5d82840af415f0dcfa9e5900c9dedf3230b264 100644 (file)
--- 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)
        {