Date: Thu, 4 Oct 2012 17:08:10 -0700 From: Garrett Cooper <yanegomi@gmail.com> To: Adrian Chadd <adrian@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r240899 - head/sys/dev/ath Message-ID: <CAGH67wQXZOPUWzKoVOWSJt3s63E4Z1c1VP1G3bO1yeiCZCHDsw@mail.gmail.com> In-Reply-To: <201209242035.q8OKZvUM093772@svn.freebsd.org> References: <201209242035.q8OKZvUM093772@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Mon, Sep 24, 2012 at 1:35 PM, Adrian Chadd <adrian@freebsd.org> wrote: > Author: adrian > Date: Mon Sep 24 20:35:56 2012 > New Revision: 240899 > URL: http://svn.freebsd.org/changeset/base/240899 > > Log: > Migrate the ath(4) KTR logging to use an ATH_KTR() macro. > > This should eventually be unified with ATH_DEBUG() so I can get both > from one macro; that may take some time. > > Add some new probes for TX and TX completion. This commit broke the non-IEEE80211_SUPPORT_TDMA case. My attached patch fixes it by better unifying the IEEE80211_SUPPORT_TDMA and non-IEEE80211_SUPPORT_TDMA cases where it made sense (it could be further unified, but that might make things more convoluted). Thanks! -Garrett [-- Attachment #2 --] Index: dev/ath/if_ath_tx.c =================================================================== --- dev/ath/if_ath_tx.c (revision 241213) +++ dev/ath/if_ath_tx.c (working copy) @@ -725,15 +725,19 @@ /* For now, so not to generate whitespace diffs */ if (1) { -#ifdef IEEE80211_SUPPORT_TDMA int qbusy; ATH_TXQ_INSERT_TAIL(txq, bf, bf_list); qbusy = ath_hal_txqenabled(ah, txq->axq_qnum); - ATH_KTR(sc, ATH_KTR_TX, 4, - "ath_tx_handoff: txq=%u, add bf=%p, qbusy=%d, depth=%d", + "ath_tx_handoff%s: txq=%u, add bf=%p, qbusy=%d, depth=%d", +#ifdef IEEE80211_SUPPORT_TDMA + "" +#else + ": non-tdma" +#endif txq->axq_qnum, bf, qbusy, txq->axq_depth); +#ifdef IEEE80211_SUPPORT_TDMA if (txq->axq_link == NULL) { /* * Be careful writing the address to TXDP. If @@ -808,14 +812,6 @@ } } #else - ATH_TXQ_INSERT_TAIL(txq, bf, bf_list); - ATH_KTR(sc, ATH_KTR_TX, 4, - "ath_tx_handoff: non-tdma: txq=%u, add bf=%p, qbusy=%d, " - "depth=%d", - txq->axq_qnum, - bf, - qbusy, - txq->axq_depth); if (txq->axq_link == NULL) { ath_hal_puttxbuf(ah, txq->axq_qnum, bf->bf_daddr); DPRINTF(sc, ATH_DEBUG_XMIT,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGH67wQXZOPUWzKoVOWSJt3s63E4Z1c1VP1G3bO1yeiCZCHDsw>