From owner-svn-src-user@FreeBSD.ORG Wed May 8 01:03:41 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 91FDE992; Wed, 8 May 2013 01:03:41 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8514EB9E; Wed, 8 May 2013 01:03:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4813fxY057439; Wed, 8 May 2013 01:03:41 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4813f7G057438; Wed, 8 May 2013 01:03:41 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201305080103.r4813f7G057438@svn.freebsd.org> From: Adrian Chadd Date: Wed, 8 May 2013 01:03:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r250345 - user/adrian/net80211_tx/sys/dev/ath X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 May 2013 01:03:41 -0000 Author: adrian Date: Wed May 8 01:03:41 2013 New Revision: 250345 URL: http://svnweb.freebsd.org/changeset/base/250345 Log: The cleanup code now takes a list of frames to complete; so it can complete them outside of the TX lock. Thus, kill the comment. Whilst I'm at it, make the debugging output optional now, rather than a printf. Modified: user/adrian/net80211_tx/sys/dev/ath/if_ath_tx.c Modified: user/adrian/net80211_tx/sys/dev/ath/if_ath_tx.c ============================================================================== --- user/adrian/net80211_tx/sys/dev/ath/if_ath_tx.c Wed May 8 00:59:17 2013 (r250344) +++ user/adrian/net80211_tx/sys/dev/ath/if_ath_tx.c Wed May 8 01:03:41 2013 (r250345) @@ -5761,17 +5761,7 @@ ath_tx_node_reassoc(struct ath_softc *sc if (tid->hwq_depth == 0) continue; ath_tx_tid_pause(sc, tid); - - /* - * XXX the TID cleanup code needs to be given an athbuf list - * to add completing frames to. Grr. - * - * So do that before this goes into the tree! - * - * That way we can hold the TX lock for the entirety of all - * of this nonsense; then the caller can make it sane. - */ - device_printf(sc->sc_dev, + DPRINTF(sc, ATH_DEBUG_NODE, "%s: %6D: TID %d: cleaning up TID\n", __func__, an->an_node.ni_macaddr,