Date: Fri, 19 Aug 2011 11:58:05 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r225004 - user/adrian/if_ath_tx/sys/dev/ath Message-ID: <201108191158.p7JBw5qs002571@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Fri Aug 19 11:58:05 2011 New Revision: 225004 URL: http://svn.freebsd.org/changeset/base/225004 Log: Tidy up some debugging, remove some now unused code. Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c 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 Fri Aug 19 10:12:02 2011 (r225003) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Fri Aug 19 11:58:05 2011 (r225004) @@ -2616,11 +2616,7 @@ ath_tx_aggr_comp_aggr(struct ath_softc * __func__, bf, SEQNO(bf->bf_state.bfs_seqno), ATH_BA_ISSET(ba, ba_index)); - /* - * For now, ACK all packets - */ if (tx_ok && ATH_BA_ISSET(ba, ba_index)) { - //if (1) { ath_tx_update_baw(sc, an, atid, SEQNO(bf->bf_state.bfs_seqno)); ath_tx_default_comp(sc, bf, 0); @@ -2785,7 +2781,7 @@ ath_tx_tid_hw_queue_aggr(struct ath_soft * data frame), schedule it directly; continue. */ if (! bf->bf_state.bfs_dobaw) { - DPRINTF(sc, ATH_DEBUG_SW_TX_CTRL, "%s: non-baw packet\n", + DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR, "%s: non-baw packet\n", __func__); ATH_TXQ_REMOVE(atid, bf, bf_list); ATH_TXQ_UNLOCK(atid); @@ -2806,7 +2802,7 @@ ath_tx_tid_hw_queue_aggr(struct ath_soft TAILQ_INIT(&bf_q); status = ath_tx_form_aggr(sc, an, atid, &bf_q); - DPRINTF(sc, ATH_DEBUG_SW_TX_CTRL, + DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR, "%s: ath_tx_form_aggr() status=%d\n", __func__, status); /* @@ -2827,7 +2823,7 @@ ath_tx_tid_hw_queue_aggr(struct ath_soft * whether it's in the BAW and added it appropriately. */ if (bf->bf_state.bfs_nframes == 1) { - DPRINTF(sc, ATH_DEBUG_SW_TX_CTRL, + DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR, "%s: single-frame aggregate\n", __func__); bf->bf_state.bfs_aggr = 0; /* Ensure the last descriptor link is 0 */ @@ -2837,7 +2833,7 @@ ath_tx_tid_hw_queue_aggr(struct ath_soft ath_hal_clr11n_aggr(sc->sc_ah, bf->bf_desc); ath_tx_set_ratectrl(sc, ni, bf); } else { - DPRINTF(sc, ATH_DEBUG_SW_TX_CTRL, + DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR, "%s: multi-frame aggregate: %d frames, length %d\n", __func__, bf->bf_state.bfs_nframes, bf->bf_state.bfs_al);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108191158.p7JBw5qs002571>