remove ad-hoc tx hang workaround - the underlying issue has been fixed a while ago
SVN-Revision: 7868
This commit is contained in:
parent
8ba5c79b5f
commit
ce4fbcf3f4
1 changed files with 0 additions and 49 deletions
|
@ -1,49 +0,0 @@
|
||||||
Index: madwifi-ng-r2525-20070630/ath/if_ath.c
|
|
||||||
===================================================================
|
|
||||||
--- madwifi-ng-r2525-20070630.orig/ath/if_ath.c 2007-07-03 23:02:29.657897250 +0200
|
|
||||||
+++ madwifi-ng-r2525-20070630/ath/if_ath.c 2007-07-03 23:02:29.917913500 +0200
|
|
||||||
@@ -2253,6 +2253,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_qnum) > 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_IRQ(txq);
|
|
||||||
|
|
||||||
@@ -7312,6 +7323,7 @@
|
|
||||||
__func__, ds);
|
|
||||||
#else
|
|
||||||
ds = bf->bf_desc; /* NB: last descriptor */
|
|
||||||
+ sc->sc_tx_start = 0;
|
|
||||||
#endif
|
|
||||||
ts = &bf->bf_dsstatus.ds_txstat;
|
|
||||||
status = ath_hal_txprocdesc(ah, ds, ts);
|
|
||||||
Index: madwifi-ng-r2525-20070630/ath/if_athvar.h
|
|
||||||
===================================================================
|
|
||||||
--- madwifi-ng-r2525-20070630.orig/ath/if_athvar.h 2007-07-03 23:02:25.669648000 +0200
|
|
||||||
+++ madwifi-ng-r2525-20070630/ath/if_athvar.h 2007-07-03 23:02:29.917913500 +0200
|
|
||||||
@@ -690,6 +690,14 @@
|
|
||||||
u_int sc_slottimeconf; /* manual override for slottime */
|
|
||||||
int16_t sc_channoise; /* Measured noise of current channel (dBm) */
|
|
||||||
u_int64_t sc_tsf; /* TSF at last rx interrupt */
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * 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 *);
|
|
Loading…
Reference in a new issue