--- /dev/null
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -169,7 +169,7 @@ static void ath_tx_flush_tid(struct ath_
+ ath_tx_update_baw(sc, tid, fi->seqno);
+ ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0, 0);
+ } else {
+- ath_tx_send_normal(sc, txq, tid, &bf_head);
++ ath_tx_send_normal(sc, txq, NULL, &bf_head);
+ }
+ spin_lock_bh(&txq->axq_lock);
+ }
--- /dev/null
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -856,7 +856,7 @@ int ath_tx_aggr_start(struct ath_softc *
+
+ txtid->state |= AGGR_ADDBA_PROGRESS;
+ txtid->paused = true;
+- *ssn = txtid->seq_start;
++ *ssn = txtid->seq_start = txtid->seq_next;
+
+ return 0;
+ }
--- /dev/null
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -858,6 +858,9 @@ int ath_tx_aggr_start(struct ath_softc *
+ txtid->paused = true;
+ *ssn = txtid->seq_start = txtid->seq_next;
+
++ memset(txtid->tx_buf, 0, sizeof(txtid->tx_buf));
++ txtid->baw_head = txtid->baw_tail = 0;
++
+ return 0;
+ }
+