Ticket #1368: ff_flushdone.diff

ath/if_ath.c

@@ -2546 +2546 @@
-                goto hardstart_fail;
-        }
-
-ff_txbuf in athff_can_aggregate(
-    
+tx_ffbuf (and txq->axq_stageq
+     in athff_can_aggregate()
-         */
-        ATH_TXQ_LOCK_IRQ(txq);
-        if (athff_can_aggregate(sc, eh, an, skb, vap->iv_fragthreshold, &ff_flush)) {
@@ -2604 +2604 @@
-                        TAILQ_REMOVE(&txq->axq_stageq, bf_ff, bf_stagelist);
-                        an->an_tx_ffbuf[skb->priority] = NULL;
-
+                        /* NB: ath_tx_start -> ath_tx_txqaddbuf uses ATH_TXQ_LOCK too */
+                        ATH_TXQ_UNLOCK_IRQ_EARLY(txq);
+
-                        /* encap and xmit */
-                        bf_ff->bf_skb = ieee80211_encap(ni, bf_ff->bf_skb, &framecnt);
-
@@ -2632 +2635 @@
-                                STAILQ_INSERT_TAIL(&sc->sc_txbuf, bf_ff, bf_list);
-                                ATH_TXBUF_UNLOCK_IRQ(sc);
-                        }
+
+                        ATH_HARDSTART_GET_TX_BUF_WITH_LOCK;
+                        if (bf == NULL) {
+                                goto hardstart_fail;
+                        }
+
+                        goto ff_flush_done;
+
+
-                }
-                /*
-                 * XXX: out-of-order condition only occurs for AP mode and multicast.
@@ -2651 +2663 @@
-
-        ATH_TXQ_UNLOCK_IRQ(txq);
-
+ff_flush_done:
-ff_bypass:
-
-#else /* ATH_SUPERG_FF */