KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more cleanup

Browse source 
SVN-Revision: 7298
This commit is contained in:
Felix Fietkau 2007-05-21 03:50:55 +00:00
parent 4aa15bd99c
commit 17ea20ab8c
1 changed files with 14 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
package/madwifi/patches/118-txstop_workaround.patch
View file

@ -1,23 +1,13 @@
diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c 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.old/ath/if_ath.c 2007-05-21 05:40:18.320301560 +0200
+++ madwifi.dev/ath/if_ath.c 2007-05-20 21:33:53.269103736 +0200 +++ madwifi.dev/ath/if_ath.c 2007-05-21 05:49:40.132893064 +0200
@@ -1711,6 +1711,7 @@ @@ -2264,6 +2264,17 @@
}
#endif
ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark);
+ sc->sc_tx_start = 0;
}
if (status & HAL_INT_BMISS) {
sc->sc_stats.ast_bmiss++;
@@ -2261,11 +2262,25 @@
txq->axq_link = &lastds->ds_link; txq->axq_link = &lastds->ds_link;
ath_hal_txstart(ah, txq->axq_qnum); ath_hal_txstart(ah, txq->axq_qnum);
sc->sc_dev->trans_start = jiffies; sc->sc_dev->trans_start = jiffies;
+ if ((sc->sc_opmode == HAL_M_IBSS) || (sc->sc_opmode == HAL_M_HOSTAP)) { + if ((sc->sc_opmode == HAL_M_IBSS) || (sc->sc_opmode == HAL_M_HOSTAP)) {
+ unsigned long last; + if (sc->sc_tx_start && (ath_hal_numtxpending(ah, txq->axq_num) > 2)) {
+ last = sc->sc_tx_start; + if (jiffies > sc->sc_tx_start + 2 * HZ) {
+ if (last) {
+ if (jiffies > last + 2 * HZ) {
+ printk("%s: Tx queue stuck. Resetting hardware...\n", sc->sc_dev->name); + printk("%s: Tx queue stuck. Resetting hardware...\n", sc->sc_dev->name);
+ ath_reset(sc->sc_dev); + ath_reset(sc->sc_dev);
+ sc->sc_tx_start = 0; + sc->sc_tx_start = 0;
@ -29,24 +19,17 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
} }
ATH_TXQ_UNLOCK(txq); ATH_TXQ_UNLOCK(txq);
sc->sc_devstats.tx_packets++; @@ -7299,6 +7310,7 @@
sc->sc_devstats.tx_bytes += framelen; #else
+ sc->sc_tx_start = 0; ds = bf->bf_desc; /* NB: last descriptor */
} #endif
+ sc->sc_tx_start = 0;
static int status = ath_hal_txprocdesc(ah, ds);
@@ -7272,7 +7287,7 @@ #ifdef AR_DEBUG
DPRINTF(sc, ATH_DEBUG_UAPSD, "%s: reaping U-APSD txq\n", __func__); if (sc->sc_debug & ATH_DEBUG_XMIT_DESC)
uapsdq = 1;
}
-
+
for (;;) {
if (uapsdq)
ATH_TXQ_UAPSDQ_LOCK_IRQ(txq);
diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h 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.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 +++ madwifi.dev/ath/if_athvar.h 2007-05-21 05:40:32.958076280 +0200
@@ -689,6 +689,14 @@ @@ -689,6 +689,14 @@
#endif #endif
u_int sc_slottimeconf; /* manual override for slottime */ u_int sc_slottimeconf; /* manual override for slottime */