From owner-svn-src-user@FreeBSD.ORG  Wed Aug 17 03:04:03 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 0D4C3106566B;
	Wed, 17 Aug 2011 03:04:03 +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 F1B528FC19;
	Wed, 17 Aug 2011 03:04:02 +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 p7H3427a084318;
	Wed, 17 Aug 2011 03:04:02 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7H342f4084316;
	Wed, 17 Aug 2011 03:04:02 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201108170304.p7H342f4084316@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 17 Aug 2011 03:04:02 +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: r224924 - 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, 17 Aug 2011 03:04:03 -0000

Author: adrian
Date: Wed Aug 17 03:04:02 2011
New Revision: 224924
URL: http://svn.freebsd.org/changeset/base/224924

Log:
  Break out the descriptor and rate control programming and place them in
  ath_tx_start().
  
  This means the descriptor setup should now be able to be delayed until
  packet scheduling to the hardware.

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 Aug 17 02:01:37 2011	(r224923)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c	Wed Aug 17 03:04:02 2011	(r224924)
@@ -959,7 +959,6 @@ ath_tx_normal_setup(struct ath_softc *sc
 	} else
 		ctsrate = 0;
 
-
 	/*
 	 * Determine if a tx interrupt should be generated for
 	 * this descriptor.  We take a tx interrupt to reap
@@ -1052,16 +1051,6 @@ ath_tx_normal_setup(struct ath_softc *sc
 		ATH_NODE_UNLOCK(an);
         }
 
-	/*
-	 * Formulate first tx descriptor with tx controls.
-	 */
-	ath_tx_setds(sc, bf);
-
-	/*
-	 * Setup rate control series.
-	 */
-	ath_tx_set_ratectrl(sc, ni, bf);
-
 	return 0;
 }
 
@@ -1166,6 +1155,16 @@ ath_tx_start(struct ath_softc *sc, struc
 	/* At this point m0 could have changed! */
 	m0 = bf->bf_m;
 
+	/*
+	 * Formulate first tx descriptor with tx controls.
+	 */
+	ath_tx_setds(sc, bf);
+
+	/*
+	 * Setup rate control series.
+	 */
+	ath_tx_set_ratectrl(sc, ni, bf);
+
 	/* Fill in the details in the descriptor list */
 	ath_tx_chaindesclist(sc, bf);