48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
|
|
--- madwifi.old/ath/if_ath.c 2007-05-21 05:40:18.320301560 +0200
|
|
+++ madwifi.dev/ath/if_ath.c 2007-05-21 05:49:40.132893064 +0200
|
|
@@ -2264,6 +2264,17 @@
|
|
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 && (ath_hal_numtxpending(ah, txq->axq_num) > 2)) {
|
|
+ if (jiffies > sc->sc_tx_start + 2 * HZ) {
|
|
+ printk("%s: Tx queue stuck. Resetting hardware...\n", sc->sc_dev->name);
|
|
+ ath_reset(sc->sc_dev);
|
|
+ sc->sc_tx_start = 0;
|
|
+ }
|
|
+ } else {
|
|
+ sc->sc_tx_start = jiffies;
|
|
+ }
|
|
+ }
|
|
}
|
|
ATH_TXQ_UNLOCK(txq);
|
|
|
|
@@ -7299,6 +7310,7 @@
|
|
#else
|
|
ds = bf->bf_desc; /* NB: last descriptor */
|
|
#endif
|
|
+ sc->sc_tx_start = 0;
|
|
status = ath_hal_txprocdesc(ah, ds);
|
|
#ifdef AR_DEBUG
|
|
if (sc->sc_debug & ATH_DEBUG_XMIT_DESC)
|
|
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-21 05:40:32.958076280 +0200
|
|
@@ -689,6 +689,14 @@
|
|
#endif
|
|
u_int sc_slottimeconf; /* manual override for slottime */
|
|
int16_t sc_channoise; /* Measured noise of current channel (dBm) */
|
|
+
|
|
+ /*
|
|
+ * Several MiniPCI cards and most SoC revs frequently cease all transmission
|
|
+ * when operating in IBSS mode. The reason for this is unknown and could potentially
|
|
+ * be a hardware bug. This variable contains the timestamp of the last successful
|
|
+ * transmission and is checked when enqueueing new frames
|
|
+ */
|
|
+ unsigned long sc_tx_start;
|
|
};
|
|
|
|
typedef void (*ath_callback) (struct ath_softc *);
|