From owner-svn-src-user@FreeBSD.ORG  Wed Jun 15 14:44:08 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8451B106566C;
	Wed, 15 Jun 2011 14:44:08 +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 7568B8FC0C;
	Wed, 15 Jun 2011 14:44:08 +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 p5FEi8Yf086134;
	Wed, 15 Jun 2011 14:44:08 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5FEi8j7086132;
	Wed, 15 Jun 2011 14:44:08 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201106151444.p5FEi8j7086132@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 15 Jun 2011 14:44:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223110 - user/adrian/if_ath_tx/sys/dev/ath
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jun 2011 14:44:08 -0000

Author: adrian
Date: Wed Jun 15 14:44:08 2011
New Revision: 223110
URL: http://svn.freebsd.org/changeset/base/223110

Log:
  A hacky hack to make the raw xmit path use the software TX queue.
  I don't like that the software TX queue bit occurs at each call to
  raw_ic_xmit but it's enough to get the ball rolling.
  
  The motivation for this is largely so per-TID action frames (addba/delba)
  occur in the correct order.

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c	Wed Jun 15 14:07:16 2011	(r223109)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c	Wed Jun 15 14:44:08 2011	(r223110)
@@ -1175,7 +1175,13 @@ ath_tx_raw_start(struct ath_softc *sc, s
 
 	/* Fill in the details in the descriptor list */
 	ath_tx_chaindesclist(sc, sc->sc_ac2q[pri], bf);
-	ath_tx_handoff(sc, sc->sc_ac2q[pri], bf);
+
+	/* Queue to software queue */
+	ath_tx_swq(sc, ni, sc->sc_ac2q[pri], bf, m0);
+
+	/* Kick txq */
+	ath_txq_sched(sc);
+
 	return 0;
 }