2008-04-20 22:01:27 +00:00
|
|
|
Merged from madwifi trunk r3551, r3552
|
|
|
|
|
|
2008-06-04 13:16:18 +00:00
|
|
|
--- a/ath/if_ath.c
|
|
|
|
|
+++ b/ath/if_ath.c
|
2008-07-25 22:41:13 +00:00
|
|
|
@@ -8257,6 +8257,17 @@
|
2008-04-20 22:01:27 +00:00
|
|
|
goto bf_fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+ /* We make sure we don't remove the TX descriptor on
|
|
|
|
|
+ * which the HW is pointing since it contains the
|
|
|
|
|
+ * ds_link field, except if this is the last TX
|
|
|
|
|
+ * descriptor in the queue */
|
|
|
|
|
+
|
|
|
|
|
+ if ((txq->axq_depth > 1) &&
|
|
|
|
|
+ (bf->bf_daddr == ath_hal_gettxbuf(ah, txq->axq_qnum))) {
|
|
|
|
|
+ ATH_TXQ_UNLOCK_IRQ_EARLY(txq);
|
|
|
|
|
+ goto bf_fail;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
ATH_TXQ_REMOVE_HEAD(txq, bf_list);
|
|
|
|
|
ATH_TXQ_UNLOCK_IRQ(txq);
|
|
|
|
|
|
2008-06-04 13:16:18 +00:00
|
|
|
--- a/ath/if_athvar.h
|
|
|
|
|
+++ b/ath/if_athvar.h
|
2008-04-20 22:01:27 +00:00
|
|
|
@@ -586,7 +586,8 @@
|
|
|
|
|
} while (0)
|
|
|
|
|
#define ATH_TXQ_REMOVE_HEAD(_tq, _field) do { \
|
|
|
|
|
STAILQ_REMOVE_HEAD(&(_tq)->axq_q, _field); \
|
|
|
|
|
- (_tq)->axq_depth--; \
|
|
|
|
|
+ if (--(_tq)->axq_depth <= 0) \
|
|
|
|
|
+ (_tq)->axq_link = NULL; \
|
|
|
|
|
} while (0)
|
|
|
|
|
/* move buffers from MCASTQ to CABQ */
|
|
|
|
|
#define ATH_TXQ_MOVE_MCASTQ(_tqs,_tqd) do { \
|
