struct ath_ratectrl {
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
-@@ -8634,6 +8634,8 @@ ath_tx_processq(struct ath_softc *sc, st
+@@ -8638,6 +8638,8 @@ ath_tx_processq(struct ath_softc *sc, st
ni = bf->bf_node;
if (ni != NULL) {
an = ATH_NODE(ni);
if (ts->ts_status == 0) {
u_int8_t txant = ts->ts_antenna;
-@@ -8686,15 +8688,43 @@ ath_tx_processq(struct ath_softc *sc, st
+@@ -8690,15 +8692,43 @@ ath_tx_processq(struct ath_softc *sc, st
lr = ts->ts_longretry;
sc->sc_stats.ast_tx_shortretry += sr;
sc->sc_stats.ast_tx_longretry += lr;
static void
--- a/ath_rate/minstrel/minstrel.h
+++ b/ath_rate/minstrel/minstrel.h
-@@ -171,36 +171,6 @@ struct minstrel_node {
+@@ -172,36 +172,6 @@ struct minstrel_node {
#define ATH_NODE_MINSTREL(an) ((struct minstrel_node *)&an[1])
0, 0,
--- a/ath_rate/sample/sample.h
+++ b/ath_rate/sample/sample.h
-@@ -98,36 +98,4 @@ struct sample_node {
+@@ -98,35 +98,4 @@ struct sample_node {
};
#define ATH_NODE_SAMPLE(an) ((struct sample_node *)&an[1])
--
-/*
- * Definitions for pulling the rate and trie counts from
- * a 5212 h/w descriptor. These Don't belong here; the