From owner-svn-src-head@FreeBSD.ORG  Sun May 19 01:33:17 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id EC246FDA;
 Sun, 19 May 2013 01:33:17 +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 DD90BD29;
 Sun, 19 May 2013 01:33:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4J1XHwg024565;
 Sun, 19 May 2013 01:33:17 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4J1XH0J024564;
 Sun, 19 May 2013 01:33:17 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201305190133.r4J1XH0J024564@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 19 May 2013 01:33:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250796 - head/sys/dev/ath
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 May 2013 01:33:18 -0000

Author: adrian
Date: Sun May 19 01:33:17 2013
New Revision: 250796
URL: http://svnweb.freebsd.org/changeset/base/250796

Log:
  More non-ATH_DEBUG build fixes.

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	Sun May 19 00:53:06 2013	(r250795)
+++ head/sys/dev/ath/if_ath_tx.c	Sun May 19 01:33:17 2013	(r250796)
@@ -929,7 +929,6 @@ ath_tx_handoff_hw(struct ath_softc *sc, 
 static void
 ath_legacy_tx_dma_restart(struct ath_softc *sc, struct ath_txq *txq)
 {
-	struct ath_hal *ah = sc->sc_ah;
 	struct ath_buf *bf, *bf_last;
 
 	ATH_TXQ_LOCK_ASSERT(txq);
@@ -949,8 +948,10 @@ ath_legacy_tx_dma_restart(struct ath_sof
 	    bf_last,
 	    (uint32_t) bf->bf_daddr);
 
+#ifdef	ATH_DEBUG
 	if (sc->sc_debug & ATH_DEBUG_RESET)
 		ath_tx_dump(sc, txq);
+#endif
 
 	/*
 	 * This is called from a restart, so DMA is known to be
@@ -964,8 +965,9 @@ ath_legacy_tx_dma_restart(struct ath_sof
 	ath_hal_puttxbuf(sc->sc_ah, txq->axq_qnum, bf->bf_daddr);
 	txq->axq_flags |= ATH_TXQ_PUTRUNNING;
 
-	ath_hal_gettxdesclinkptr(ah, bf_last->bf_lastds, &txq->axq_link);
-	ath_hal_txstart(ah, txq->axq_qnum);
+	ath_hal_gettxdesclinkptr(sc->sc_ah, bf_last->bf_lastds,
+	    &txq->axq_link);
+	ath_hal_txstart(sc->sc_ah, txq->axq_qnum);
 }
 
 /*