From owner-svn-src-all@FreeBSD.ORG Thu Mar 22 21:48:37 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 882611065675; Thu, 22 Mar 2012 21:48:37 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 70E3F8FC18; Thu, 22 Mar 2012 21:48:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2MLmbHR042878; Thu, 22 Mar 2012 21:48:37 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2MLmba0042876; Thu, 22 Mar 2012 21:48:37 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201203222148.q2MLmba0042876@svn.freebsd.org> From: Adrian Chadd Date: Thu, 22 Mar 2012 21:48:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233330 - head/sys/dev/ath X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Mar 2012 21:48:37 -0000 Author: adrian Date: Thu Mar 22 21:48:36 2012 New Revision: 233330 URL: http://svn.freebsd.org/changeset/base/233330 Log: Add some further debugging to try and aid tracking down what the state of things were just before a full software queue is drained. Modified: head/sys/dev/ath/if_ath_tx.c Modified: head/sys/dev/ath/if_ath_tx.c ============================================================================== --- head/sys/dev/ath/if_ath_tx.c Thu Mar 22 21:47:14 2012 (r233329) +++ head/sys/dev/ath/if_ath_tx.c Thu Mar 22 21:48:36 2012 (r233330) @@ -663,6 +663,15 @@ ath_tx_tag_crypto(struct ath_softc *sc, struct mbuf *m0, int iswep, int isfrag, int *hdrlen, int *pktlen, int *keyix) { + DPRINTF(sc, ATH_DEBUG_XMIT, + "%s: hdrlen=%d, pktlen=%d, isfrag=%d, iswep=%d, m0=%p\n", + __func__, + *hdrlen, + *pktlen, + isfrag, + iswep, + m0); + if (iswep) { const struct ieee80211_cipher *cip; struct ieee80211_key *k; @@ -1473,6 +1482,7 @@ ath_tx_start(struct ath_softc *sc, struc /* No AMPDU TX, we've been assigned a sequence number. */ if (IEEE80211_QOS_HAS_SEQ(wh)) { bf->bf_state.bfs_seqno_assigned = 1; + /* XXX we should store the frag+seqno in bfs_seqno */ bf->bf_state.bfs_seqno = M_SEQNO_GET(m0) << IEEE80211_SEQ_SEQ_SHIFT; } @@ -2636,6 +2646,15 @@ ath_tx_tid_drain(struct ath_softc *sc, s if (t == 0) { device_printf(sc->sc_dev, + "%s: node %p: bf=%p: addbaw=%d, dobaw=%d, " + "seqno_assign=%d, seqno_required=%d, seqno=%d\n", + __func__, ni, bf, + bf->bf_state.bfs_addedbaw, + bf->bf_state.bfs_dobaw, + bf->bf_state.bfs_need_seqno, + bf->bf_state.bfs_seqno_assigned, + SEQNO(bf->bf_state.bfs_seqno)); + device_printf(sc->sc_dev, "%s: node %p: bf=%p: tid %d: txq_depth=%d, " "txq_aggr_depth=%d, sched=%d, paused=%d, " "hwq_depth=%d, incomp=%d, baw_head=%d, "