summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2012-05-21 22:39:13 +0000
committeradrian <adrian@FreeBSD.org>2012-05-21 22:39:13 +0000
commit36f1ea103b76c95b29f80e73342e213b320cd352 (patch)
tree7f377cdfceeebf18e864167d1b06c23f2280bb42
parente145f3abacb653cde285ce9e2ca4c637f6265876 (diff)
downloadFreeBSD-src-36f1ea103b76c95b29f80e73342e213b320cd352.zip
FreeBSD-src-36f1ea103b76c95b29f80e73342e213b320cd352.tar.gz
Rename ath_tx_cleanup() -> ath_tx_tid_cleanup() in order to not clash
with a symbol in if_ath.c
-rw-r--r--sys/dev/ath/if_ath_tx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ath/if_ath_tx.c b/sys/dev/ath/if_ath_tx.c
index abe045e..1875e87 100644
--- a/sys/dev/ath/if_ath_tx.c
+++ b/sys/dev/ath/if_ath_tx.c
@@ -3094,7 +3094,7 @@ ath_tx_comp_cleanup_unaggr(struct ath_softc *sc, struct ath_buf *bf)
* The caller is responsible for pausing the TID.
*/
static void
-ath_tx_cleanup(struct ath_softc *sc, struct ath_node *an, int tid)
+ath_tx_tid_cleanup(struct ath_softc *sc, struct ath_node *an, int tid)
{
struct ath_tid *atid = &an->an_tid[tid];
struct ieee80211_tx_ampdu *tap;
@@ -4419,11 +4419,11 @@ ath_addba_stop(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap)
sc->sc_addba_stop(ni, tap);
/*
- * ath_tx_cleanup will resume the TID if possible, otherwise
+ * ath_tx_tid_cleanup will resume the TID if possible, otherwise
* it'll set the cleanup flag, and it'll be unpaused once
* things have been cleaned up.
*/
- ath_tx_cleanup(sc, an, tid);
+ ath_tx_tid_cleanup(sc, an, tid);
}
/*
OpenPOWER on IntegriCloud