From owner-svn-src-all@FreeBSD.ORG  Mon Aug 20 18:57:41 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 A07CF106566B;
	Mon, 20 Aug 2012 18:57:41 +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 8C84B8FC12;
	Mon, 20 Aug 2012 18:57:41 +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 q7KIvfDK078546;
	Mon, 20 Aug 2012 18:57:41 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7KIvfRP078544;
	Mon, 20 Aug 2012 18:57:41 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201208201857.q7KIvfRP078544@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 20 Aug 2012 18:57:41 +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: r239465 - 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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2012 18:57:41 -0000

Author: adrian
Date: Mon Aug 20 18:57:41 2012
New Revision: 239465
URL: http://svn.freebsd.org/changeset/base/239465

Log:
  Fix a build issue when ATH_DEBUG isn't defined - just initialise and use
  qnum.

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	Mon Aug 20 18:45:16 2012	(r239464)
+++ head/sys/dev/ath/if_ath_tx.c	Mon Aug 20 18:57:41 2012	(r239465)
@@ -307,7 +307,7 @@ ath_tx_chaindesclist(struct ath_softc *s
 	uint32_t segLenList[4];
 	int numTxMaps = 1;
 	int isFirstDesc = 1;
-	int qnum = 0;	/* XXX update */
+	int qnum;
 
 	/*
 	 * XXX There's txdma and txdma_mgmt; the descriptor
@@ -366,11 +366,13 @@ ath_tx_chaindesclist(struct ath_softc *s
 		 * it may actually be pointing to the multicast software
 		 * TXQ id.  These must be fixed!
 		 */
+		qnum = bf->bf_state.bfs_txq->axq_qnum;
+
 		ath_hal_filltxdesc(ah, (struct ath_desc *) ds
 			, bufAddrList
 			, segLenList
 			, bf->bf_descid		/* XXX desc id */
-			, bf->bf_state.bfs_txq->axq_qnum	/* XXX multicast? */
+			, qnum
 			, isFirstDesc		/* first segment */
 			, i == bf->bf_nseg - 1	/* last segment */
 			, (struct ath_desc *) ds0	/* first descriptor */