From d50ea6acfa65c514adb6cedf318e778ddd419336 Mon Sep 17 00:00:00 2001 From: Sam Leffler Date: Sun, 24 Jun 2007 01:57:20 +0000 Subject: [PATCH] Process tx callbacks when draining the tx q; this fixes a problem where a device timeout that occurs with a mgt frame on the tx q will leave the net80211 layer w/o any way to make progress. Reviewed by: thompsa, sephe Approved by: re (hrs) --- sys/dev/ath/if_ath.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 2841e8e473a..2e85aec9f17 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -4798,8 +4798,10 @@ ath_tx_draintxq(struct ath_softc *sc, struct ath_txq *txq) bf->bf_node = NULL; if (ni != NULL) { /* - * Reclaim node reference. + * Do any callback and reclaim the node reference. */ + if (bf->bf_m->m_flags & M_TXCB) + ieee80211_process_callback(ni, bf->bf_m, -1); ieee80211_free_node(ni); } m_freem(bf->bf_m);