From 45dfb769f86e3c43b50a3750f1e4f6eafe2a5687 Mon Sep 17 00:00:00 2001 From: sam Date: Wed, 30 Mar 2005 20:17:18 +0000 Subject: [PATCH] rev rate control api to pass the both the first+last tx descriptors to the rate control module for tx complete processing; this enables rate control algorithms to extract the packet length for xmits that require multiple descriptors --- sys/dev/ath/ath_rate/amrr/amrr.c | 4 ++-- sys/dev/ath/ath_rate/onoe/onoe.c | 4 ++-- sys/dev/ath/if_ath.c | 2 +- sys/dev/ath/if_athrate.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/ath/ath_rate/amrr/amrr.c b/sys/dev/ath/ath_rate/amrr/amrr.c index ae61d44af22e..3afdd2c061b0 100644 --- a/sys/dev/ath/ath_rate/amrr/amrr.c +++ b/sys/dev/ath/ath_rate/amrr/amrr.c @@ -141,8 +141,8 @@ ath_rate_setupxtxdesc(struct ath_softc *sc, struct ath_node *an, } void -ath_rate_tx_complete(struct ath_softc *sc, - struct ath_node *an, const struct ath_desc *ds) +ath_rate_tx_complete(struct ath_softc *sc, struct ath_node *an, + const struct ath_desc *ds, const struct ath_desc *ds0) { struct amrr_node *amn = ATH_NODE_AMRR(an); int sr = ds->ds_txstat.ts_shortretry; diff --git a/sys/dev/ath/ath_rate/onoe/onoe.c b/sys/dev/ath/ath_rate/onoe/onoe.c index 3bc90b3750df..09c5531aadc4 100644 --- a/sys/dev/ath/ath_rate/onoe/onoe.c +++ b/sys/dev/ath/ath_rate/onoe/onoe.c @@ -158,8 +158,8 @@ ath_rate_setupxtxdesc(struct ath_softc *sc, struct ath_node *an, } void -ath_rate_tx_complete(struct ath_softc *sc, - struct ath_node *an, const struct ath_desc *ds) +ath_rate_tx_complete(struct ath_softc *sc, struct ath_node *an, + const struct ath_desc *ds, const struct ath_desc *ds0) { struct onoe_node *on = ATH_NODE_ONOE(an); diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 0cbc708fa72a..3eab36aefc06 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -3551,7 +3551,7 @@ ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq) /* * Hand the descriptor to the rate control algorithm. */ - ath_rate_tx_complete(sc, an, ds); + ath_rate_tx_complete(sc, an, ds, ds0); /* * Reclaim reference to node. * diff --git a/sys/dev/ath/if_athrate.h b/sys/dev/ath/if_athrate.h index 8a6a87b43425..8acb0466004b 100644 --- a/sys/dev/ath/if_athrate.h +++ b/sys/dev/ath/if_athrate.h @@ -136,5 +136,5 @@ void ath_rate_setupxtxdesc(struct ath_softc *, struct ath_node *, * failed (consult the descriptor for details). */ void ath_rate_tx_complete(struct ath_softc *, struct ath_node *, - const struct ath_desc *); + const struct ath_desc *last, const struct ath_desc *first); #endif /* _ATH_RATECTRL_H_ */