more cleanup
[openwrt/staging/florian.git] / package / madwifi / patches / 118-txstop_workaround.patch
1 diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
2 --- madwifi.old/ath/if_ath.c 2007-05-21 05:40:18.320301560 +0200
3 +++ madwifi.dev/ath/if_ath.c 2007-05-21 05:49:40.132893064 +0200
4 @@ -2264,6 +2264,17 @@
5 txq->axq_link = &lastds->ds_link;
6 ath_hal_txstart(ah, txq->axq_qnum);
7 sc->sc_dev->trans_start = jiffies;
8 + if ((sc->sc_opmode == HAL_M_IBSS) || (sc->sc_opmode == HAL_M_HOSTAP)) {
9 + if (sc->sc_tx_start && (ath_hal_numtxpending(ah, txq->axq_num) > 2)) {
10 + if (jiffies > sc->sc_tx_start + 2 * HZ) {
11 + printk("%s: Tx queue stuck. Resetting hardware...\n", sc->sc_dev->name);
12 + ath_reset(sc->sc_dev);
13 + sc->sc_tx_start = 0;
14 + }
15 + } else {
16 + sc->sc_tx_start = jiffies;
17 + }
18 + }
19 }
20 ATH_TXQ_UNLOCK(txq);
21
22 @@ -7299,6 +7310,7 @@
23 #else
24 ds = bf->bf_desc; /* NB: last descriptor */
25 #endif
26 + sc->sc_tx_start = 0;
27 status = ath_hal_txprocdesc(ah, ds);
28 #ifdef AR_DEBUG
29 if (sc->sc_debug & ATH_DEBUG_XMIT_DESC)
30 diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
31 --- madwifi.old/ath/if_athvar.h 2007-05-04 23:09:29.000000000 +0200
32 +++ madwifi.dev/ath/if_athvar.h 2007-05-21 05:40:32.958076280 +0200
33 @@ -689,6 +689,14 @@
34 #endif
35 u_int sc_slottimeconf; /* manual override for slottime */
36 int16_t sc_channoise; /* Measured noise of current channel (dBm) */
37 +
38 + /*
39 + * Several MiniPCI cards and most SoC revs frequently cease all transmission
40 + * when operating in IBSS mode. The reason for this is unknown and could potentially
41 + * be a hardware bug. This variable contains the timestamp of the last successful
42 + * transmission and is checked when enqueueing new frames
43 + */
44 + unsigned long sc_tx_start;
45 };
46
47 typedef void (*ath_callback) (struct ath_softc *);