X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/6dfe719aaccfb40e57beebe327d5c41074d91f03..fbc526f4bfcd2d59aa2832717bd41499a0eb1011:/package/madwifi/patches/118-txstop_workaround.patch

diff --git a/package/madwifi/patches/118-txstop_workaround.patch b/package/madwifi/patches/118-txstop_workaround.patch
index f478ea615..3133c41e6 100644
--- a/package/madwifi/patches/118-txstop_workaround.patch
+++ b/package/madwifi/patches/118-txstop_workaround.patch
@@ -1,58 +1,41 @@
-diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
---- madwifi.old/ath/if_ath.c	2007-05-15 16:26:02.721036296 +0200
-+++ madwifi.dev/ath/if_ath.c	2007-05-16 15:43:23.095362056 +0200
-@@ -1711,6 +1711,7 @@
- 			} 
- #endif
- 			ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark);
-+			sc->sc_tx_start = 0;
- 		}
- 		if (status & HAL_INT_BMISS) {
- 			sc->sc_stats.ast_bmiss++;
-@@ -2261,6 +2262,25 @@
+Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_ath.c	2007-06-04 13:21:56.713354928 +0200
++++ madwifi-ng-r2420-20070602/ath/if_ath.c	2007-06-04 13:21:56.911324832 +0200
+@@ -2242,6 +2242,17 @@
  		txq->axq_link = &lastds->ds_link;
  		ath_hal_txstart(ah, txq->axq_qnum);
  		sc->sc_dev->trans_start = jiffies;
 +		if ((sc->sc_opmode == HAL_M_IBSS) || (sc->sc_opmode == HAL_M_HOSTAP)) {
-+			unsigned long last;
-+			ATH_LOCK(sc);
-+			last = sc->sc_tx_start;
-+			ATH_UNLOCK(sc);
-+			if (last) {
-+				if (jiffies > last + 2 * HZ) {
++			if (sc->sc_tx_start && (ath_hal_numtxpending(ah, txq->axq_qnum) > 2)) {
++				if (jiffies > sc->sc_tx_start + 2 * HZ) {
 +					printk("%s: Tx queue stuck. Resetting hardware...\n", sc->sc_dev->name);
 +					ath_reset(sc->sc_dev);
-+					ATH_LOCK(sc);
 +					sc->sc_tx_start = 0;
-+					ATH_UNLOCK(sc);
 +				}
 +			} else {
-+				ATH_LOCK(sc);
 +				sc->sc_tx_start = jiffies;
-+				ATH_UNLOCK(sc);
 +			}
 +		}
  	}
- 	ATH_TXQ_UNLOCK(txq);
- 
-@@ -7289,6 +7309,10 @@
- 			break;
- 		}
+ 	ATH_TXQ_UNLOCK_IRQ(txq);
  
-+		ATH_LOCK(sc);
+@@ -7285,6 +7296,7 @@
+ 			__func__, ds);
+ #else
+ 		ds = bf->bf_desc;		/* NB: last descriptor */
 +		sc->sc_tx_start = 0;
-+		ATH_UNLOCK(sc);
-+
- #ifdef ATH_SUPERG_FF
- 		ds = &bf->bf_desc[bf->bf_numdescff];
- 		DPRINTF(sc, ATH_DEBUG_TX_PROC, "%s: frame's last desc: %p\n",
-diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
---- madwifi.old/ath/if_athvar.h	2007-05-04 23:09:29.000000000 +0200
-+++ madwifi.dev/ath/if_athvar.h	2007-05-15 16:26:28.911054808 +0200
-@@ -689,6 +689,14 @@
  #endif
+ 		ts = &bf->bf_dsstatus.ds_txstat;
+ 		status = ath_hal_txprocdesc(ah, ds, ts);
+Index: madwifi-ng-r2420-20070602/ath/if_athvar.h
+===================================================================
+--- madwifi-ng-r2420-20070602.orig/ath/if_athvar.h	2007-06-04 13:21:53.369863216 +0200
++++ madwifi-ng-r2420-20070602/ath/if_athvar.h	2007-06-04 13:21:56.911324832 +0200
+@@ -686,6 +686,14 @@
  	u_int sc_slottimeconf;			/* manual override for slottime */
  	int16_t sc_channoise; 			/* Measured noise of current channel (dBm) */
+ 	u_int64_t sc_tsf;			/* TSF at last rx interrupt */
 +
 +	/* 
 +	 * Several MiniPCI cards and most SoC revs frequently cease all transmission