svn commit: r225939 - user/adrian/if_ath_tx/sys/dev/ath

[Adrian Chadd]

Author: adrian
Date: Mon Oct  3 16:02:55 2011
New Revision: 225939
URL: http://svn.freebsd.org/changeset/base/225939

Log:
  Remove some duplicate code.

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/if_ath.c
  user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c
  user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.h

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath.c	Mon Oct  3 15:32:15 2011	(r225938)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c	Mon Oct  3 16:02:55 2011	(r225939)
@@ -3376,7 +3376,7 @@ ath_node_cleanup(struct ieee80211_node *
         struct ath_softc *sc = ic->ic_ifp->if_softc;
 
 	/* Cleanup ath_tid, free unused bufs, unlink bufs in TXQ */
-	ath_tx_tid_cleanup(sc, ATH_NODE(ni));
+	ath_tx_node_flush(sc, ATH_NODE(ni));
 	ath_rate_node_cleanup(sc, ATH_NODE(ni));
 	sc->sc_node_cleanup(ni);
 }

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c	Mon Oct  3 15:32:15 2011	(r225938)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c	Mon Oct  3 16:02:55 2011	(r225939)
@@ -2235,13 +2235,6 @@ ath_tx_tid_resume(struct ath_softc *sc, 
 	ath_txq_sched(sc, sc->sc_ac2q[tid->ac]);
 }
 
-static void
-ath_tx_tid_txq_unmark(struct ath_softc *sc, struct ath_node *an,
-    int tid)
-{
-	/* XXX TODO */
-}
-
 /*
  * Free any packets currently pending in the software TX queue.
  *
@@ -2413,31 +2406,6 @@ ath_tx_txq_drain(struct ath_softc *sc, s
 }
 
 /*
- * Free the per-TID node state.
- *
- * This frees any packets currently in the software queue and frees
- * any other TID state.
- */
-void
-ath_tx_tid_cleanup(struct ath_softc *sc, struct ath_node *an)
-{
-	int tid;
-	struct ath_tid *atid;
-
-	DPRINTF(sc, ATH_DEBUG_SW_TX_CTRL, "%s: node %p: cleaning up\n",
-	    __func__, an);
-
-	/* Flush all packets currently in the sw queues for this node */
-	ath_tx_node_flush(sc, an);
-
-	for (tid = 0; tid < IEEE80211_TID_SIZE; tid++) {
-		atid = &an->an_tid[tid];
-		/* Mark hw-queued packets as having no parent now */
-		ath_tx_tid_txq_unmark(sc, an, tid);
-	}
-}
-
-/*
  * Handle completion of non-aggregate session frames.
  */
 void

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.h
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.h	Mon Oct  3 15:32:15 2011	(r225938)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.h	Mon Oct  3 16:02:55 2011	(r225939)
@@ -95,7 +95,6 @@ extern int ath_raw_xmit(struct ieee80211
 extern void ath_tx_swq(struct ath_softc *sc, struct ieee80211_node *ni,
     struct ath_txq *txq, struct ath_buf *bf);
 extern void ath_tx_tid_init(struct ath_softc *sc, struct ath_node *an);
-extern void ath_tx_tid_cleanup(struct ath_softc *sc, struct ath_node *an);
 extern void ath_tx_tid_hw_queue_aggr(struct ath_softc *sc, struct ath_node *an,
     struct ath_tid *tid);
 extern void ath_tx_tid_hw_queue_norm(struct ath_softc *sc, struct ath_node *an,