From owner-svn-src-all@FreeBSD.ORG  Mon Sep 24 06:00:52 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 6CEF21065675;
	Mon, 24 Sep 2012 06:00:52 +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 587418FC19;
	Mon, 24 Sep 2012 06:00:52 +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 q8O60qUR055979;
	Mon, 24 Sep 2012 06:00:52 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8O60qwe055976;
	Mon, 24 Sep 2012 06:00:52 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201209240600.q8O60qwe055976@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 24 Sep 2012 06:00:52 +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: r240882 - 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, 24 Sep 2012 06:00:52 -0000

Author: adrian
Date: Mon Sep 24 06:00:51 2012
New Revision: 240882
URL: http://svn.freebsd.org/changeset/base/240882

Log:
  In (eventual) preparation for supporting disabling the whole 11n/software
  retry path - add some code to make it obvious (to me!) how to disable
  the software tx path.

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 Sep 24 05:24:10 2012	(r240881)
+++ head/sys/dev/ath/if_ath_tx.c	Mon Sep 24 06:00:51 2012	(r240882)
@@ -2012,6 +2012,7 @@ ath_tx_raw_start(struct ath_softc *sc, s
 	DPRINTF(sc, ATH_DEBUG_SW_TX, "%s: dooverride=%d\n",
 	    __func__, do_override);
 
+#if 1
 	if (do_override) {
 		bf->bf_state.bfs_txflags |= HAL_TXDESC_CLRDMASK;
 		ath_tx_xmit_normal(sc, sc->sc_ac2q[pri], bf);
@@ -2019,6 +2020,11 @@ ath_tx_raw_start(struct ath_softc *sc, s
 		/* Queue to software queue */
 		ath_tx_swq(sc, ni, sc->sc_ac2q[pri], bf);
 	}
+#else
+	/* Direct-dispatch to the hardware */
+	bf->bf_state.bfs_txflags |= HAL_TXDESC_CLRDMASK;
+	ath_tx_xmit_normal(sc, sc->sc_ac2q[pri], bf);
+#endif
 	ATH_TXQ_UNLOCK(sc->sc_ac2q[pri]);
 
 	return 0;