diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-16 13:44:06 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-16 13:44:06 +0000 |
| commit | 6dfe719aaccfb40e57beebe327d5c41074d91f03 (patch) | |
| tree | f90155e3b464ed1eff90baed4e1020404aadda8e /package/madwifi/patches | |
| parent | 0c0407178e0f768de17a6c71dbb3057cdd270490 (diff) | |
make txstop workaround safe with napi polling
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7258 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/madwifi/patches')
| -rw-r--r-- | package/madwifi/patches/118-txstop_workaround.patch | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/package/madwifi/patches/118-txstop_workaround.patch b/package/madwifi/patches/118-txstop_workaround.patch index e50e9a85f..f478ea615 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 */ |