]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: rtl8192e: Remove useless TxCheckStuck function
authorMike McCormack <mikem@ring3k.org>
Thu, 10 Feb 2011 23:44:44 +0000 (08:44 +0900)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Feb 2011 20:35:33 +0000 (12:35 -0800)
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/rtl8192e/r8192E_core.c

index 1b0cd9eac5d3afc89169cbe53da079f5a5374217..d6af0b6b8e1336c84daa236b5bee116a2a8ba735 100644 (file)
@@ -3069,60 +3069,6 @@ static void rtl8192_start_beacon(struct net_device *dev)
        rtl8192_irq_enable(dev);
 }
 
-static bool HalTxCheckStuck8190Pci(struct net_device *dev)
-{
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       u16 RegTxCounter = read_nic_word(priv, 0x128);
-       bool                            bStuck = FALSE;
-       RT_TRACE(COMP_RESET,"%s():RegTxCounter is %d,TxCounter is %d\n",__FUNCTION__,RegTxCounter,priv->TxCounter);
-       if(priv->TxCounter==RegTxCounter)
-               bStuck = TRUE;
-
-       priv->TxCounter = RegTxCounter;
-
-       return bStuck;
-}
-
-/*
- * Assumption: RT_TX_SPINLOCK is acquired.
- */
-static RESET_TYPE
-TxCheckStuck(struct net_device *dev)
-{
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       u8                      ResetThreshold = NIC_SEND_HANG_THRESHOLD_POWERSAVE;
-       bool                    bCheckFwTxCnt = false;
-
-       //
-       // Decide Stuch threshold according to current power save mode
-       //
-       switch (priv->ieee80211->dot11PowerSaveMode)
-       {
-               // The threshold value  may required to be adjusted .
-               case eActive:           // Active/Continuous access.
-                       ResetThreshold = NIC_SEND_HANG_THRESHOLD_NORMAL;
-                       break;
-               case eMaxPs:            // Max power save mode.
-                       ResetThreshold = NIC_SEND_HANG_THRESHOLD_POWERSAVE;
-                       break;
-               case eFastPs:   // Fast power save mode.
-                       ResetThreshold = NIC_SEND_HANG_THRESHOLD_POWERSAVE;
-                       break;
-       }
-
-       if(bCheckFwTxCnt)
-       {
-               if(HalTxCheckStuck8190Pci(dev))
-               {
-                       RT_TRACE(COMP_RESET, "TxCheckStuck(): Fw indicates no Tx condition! \n");
-                       return RESET_TYPE_SILENT;
-               }
-       }
-
-       return RESET_TYPE_NORESET;
-}
-
-
 static bool HalRxCheckStuck8190Pci(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
@@ -3205,8 +3151,6 @@ rtl819x_ifcheck_resetornot(struct net_device *dev)
 
        rfState = priv->ieee80211->eRFPowerState;
 
-       TxResetType = TxCheckStuck(dev);
-
        if( rfState != eRfOff &&
                /*ADAPTER_TEST_STATUS_FLAG(Adapter, ADAPTER_STATUS_FW_DOWNLOAD_FAILURE)) &&*/
                (priv->ieee80211->iw_mode != IW_MODE_ADHOC))