|
@@ -446,13 +446,13 @@ static void ath_tx_count_frames(struct ath_softc *sc, struct ath_buf *bf,
|
|
|
static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
|
|
|
struct ath_buf *bf, struct list_head *bf_q,
|
|
|
struct ieee80211_sta *sta,
|
|
|
+ struct ath_atx_tid *tid,
|
|
|
struct ath_tx_status *ts, int txok)
|
|
|
{
|
|
|
struct ath_node *an = NULL;
|
|
|
struct sk_buff *skb;
|
|
|
struct ieee80211_hdr *hdr;
|
|
|
struct ieee80211_tx_info *tx_info;
|
|
|
- struct ath_atx_tid *tid = NULL;
|
|
|
struct ath_buf *bf_next, *bf_last = bf->bf_lastbf;
|
|
|
struct list_head bf_head;
|
|
|
struct sk_buff_head bf_pending;
|
|
@@ -494,7 +494,6 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
|
|
|
}
|
|
|
|
|
|
an = (struct ath_node *)sta->drv_priv;
|
|
|
- tid = ath_get_skb_tid(sc, an, skb);
|
|
|
seq_first = tid->seq_start;
|
|
|
isba = ts->ts_flags & ATH9K_TX_BA;
|
|
|
|
|
@@ -680,6 +679,7 @@ static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,
|
|
|
struct ieee80211_tx_info *info;
|
|
|
struct ieee80211_sta *sta;
|
|
|
struct ieee80211_hdr *hdr;
|
|
|
+ struct ath_atx_tid *tid = NULL;
|
|
|
bool txok, flush;
|
|
|
|
|
|
txok = !(ts->ts_status & ATH9K_TXERR_MASK);
|
|
@@ -695,6 +695,12 @@ static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,
|
|
|
|
|
|
hdr = (struct ieee80211_hdr *) bf->bf_mpdu->data;
|
|
|
sta = ieee80211_find_sta_by_ifaddr(hw, hdr->addr1, hdr->addr2);
|
|
|
+ if (sta) {
|
|
|
+ struct ath_node *an = (struct ath_node *)sta->drv_priv;
|
|
|
+ tid = ath_get_skb_tid(sc, an, bf->bf_mpdu);
|
|
|
+ if (ts->ts_status & (ATH9K_TXERR_FILT | ATH9K_TXERR_XRETRY))
|
|
|
+ tid->clear_ps_filter = true;
|
|
|
+ }
|
|
|
|
|
|
if (!bf_isampdu(bf)) {
|
|
|
if (!flush) {
|
|
@@ -706,7 +712,7 @@ static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,
|
|
|
}
|
|
|
ath_tx_complete_buf(sc, bf, txq, bf_head, sta, ts, txok);
|
|
|
} else
|
|
|
- ath_tx_complete_aggr(sc, txq, bf, bf_head, sta, ts, txok);
|
|
|
+ ath_tx_complete_aggr(sc, txq, bf, bf_head, sta, tid, ts, txok);
|
|
|
|
|
|
if (!flush)
|
|
|
ath_txq_schedule(sc, txq);
|