From 8693233b735bc1b50fcf39daf9db6e0913aed3fa Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 16 May 2007 13:44:06 +0000
Subject: [PATCH] make txstop workaround safe with napi polling

SVN-Revision: 7258
---
 .../patches/118-txstop_workaround.patch       | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/package/madwifi/patches/118-txstop_workaround.patch b/package/madwifi/patches/118-txstop_workaround.patch
index e50e9a85f8..f478ea6152 100644
--- a/package/madwifi/patches/118-txstop_workaround.patch
+++ b/package/madwifi/patches/118-txstop_workaround.patch
@@ -1,6 +1,6 @@
-diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c
---- madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c	2007-05-13 18:17:56.196025944 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c	2007-05-13 18:17:56.284012568 +0200
+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
@@ -9,27 +9,46 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcoun
  		}
  		if (status & HAL_INT_BMISS) {
  			sc->sc_stats.ast_bmiss++;
-@@ -2264,6 +2265,17 @@
+@@ -2261,6 +2262,25 @@
  		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)) {
-+			if (sc->sc_tx_start) {
-+				if (jiffies > sc->sc_tx_start + 2 * HZ) {
++			unsigned long last;
++			ATH_LOCK(sc);
++			last = sc->sc_tx_start;
++			ATH_UNLOCK(sc);
++			if (last) {
++				if (jiffies > last + 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);
  
-diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_athvar.h madwifi-ng-refcount-r2313-20070505.dev/ath/if_athvar.h
---- madwifi-ng-refcount-r2313-20070505.old/ath/if_athvar.h	2007-05-04 23:09:29.000000000 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_athvar.h	2007-05-13 18:17:56.285012416 +0200
+@@ -7289,6 +7309,10 @@
+ 			break;
+ 		}
+ 
++		ATH_LOCK(sc);
++		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
  	u_int sc_slottimeconf;			/* manual override for slottime */