f478ea6152facccb65c123eb84703eed49d9fb18
[openwrt/svn-archive/archive.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-15 16:26:02.721036296 +0200
3 +++ madwifi.dev/ath/if_ath.c 2007-05-16 15:43:23.095362056 +0200
4 @@ -1711,6 +1711,7 @@
5 }
6 #endif
7 ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark);
8 + sc->sc_tx_start = 0;
9 }
10 if (status & HAL_INT_BMISS) {
11 sc->sc_stats.ast_bmiss++;
12 @@ -2261,6 +2262,25 @@
13 txq->axq_link = &lastds->ds_link;
14 ath_hal_txstart(ah, txq->axq_qnum);
15 sc->sc_dev->trans_start = jiffies;
16 + if ((sc->sc_opmode == HAL_M_IBSS) || (sc->sc_opmode == HAL_M_HOSTAP)) {
17 + unsigned long last;
18 + ATH_LOCK(sc);
19 + last = sc->sc_tx_start;
20 + ATH_UNLOCK(sc);
21 + if (last) {
22 + if (jiffies > last + 2 * HZ) {
23 + printk("%s: Tx queue stuck. Resetting hardware...\n", sc->sc_dev->name);
24 + ath_reset(sc->sc_dev);
25 + ATH_LOCK(sc);
26 + sc->sc_tx_start = 0;
27 + ATH_UNLOCK(sc);
28 + }
29 + } else {
30 + ATH_LOCK(sc);
31 + sc->sc_tx_start = jiffies;
32 + ATH_UNLOCK(sc);
33 + }
34 + }
35 }
36 ATH_TXQ_UNLOCK(txq);
37
38 @@ -7289,6 +7309,10 @@
39 break;
40 }
41
42 + ATH_LOCK(sc);
43 + sc->sc_tx_start = 0;
44 + ATH_UNLOCK(sc);
45 +
46 #ifdef ATH_SUPERG_FF
47 ds = &bf->bf_desc[bf->bf_numdescff];
48 DPRINTF(sc, ATH_DEBUG_TX_PROC, "%s: frame's last desc: %p\n",
49 diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
50 --- madwifi.old/ath/if_athvar.h 2007-05-04 23:09:29.000000000 +0200
51 +++ madwifi.dev/ath/if_athvar.h 2007-05-15 16:26:28.911054808 +0200
52 @@ -689,6 +689,14 @@
53 #endif
54 u_int sc_slottimeconf; /* manual override for slottime */
55 int16_t sc_channoise; /* Measured noise of current channel (dBm) */
56 +
57 + /*
58 + * Several MiniPCI cards and most SoC revs frequently cease all transmission
59 + * when operating in IBSS mode. The reason for this is unknown and could potentially
60 + * be a hardware bug. This variable contains the timestamp of the last successful
61 + * transmission and is checked when enqueueing new frames
62 + */
63 + unsigned long sc_tx_start;
64 };
65
66 typedef void (*ath_callback) (struct ath_softc *);