From owner-p4-projects@FreeBSD.ORG  Sat Nov 26 00:54:24 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D6FDF16A438; Sat, 26 Nov 2005 00:54:23 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B134616A42B
	for <perforce@freebsd.org>; Sat, 26 Nov 2005 00:54:23 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A81AC43D9A
	for <perforce@freebsd.org>; Sat, 26 Nov 2005 00:54:07 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAQ0s4FU015275
	for <perforce@freebsd.org>; Sat, 26 Nov 2005 00:54:04 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAQ0s4KM015272
	for perforce@freebsd.org; Sat, 26 Nov 2005 00:54:04 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 26 Nov 2005 00:54:04 GMT
Message-Id: <200511260054.jAQ0s4KM015272@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 87231 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Nov 2005 00:54:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=87231

Change 87231 by sam@sam_ebb on 2005/11/26 00:53:59

	do tx complete callback

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/if_ath.c#115 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ath/if_ath.c#115 (text+ko) ====

@@ -4320,7 +4320,15 @@
 					nacked++;
 				ath_rate_tx_complete(sc, an, ds, ds0);
 			}
+
 			/*
+			 * Do any tx complete callback.  Note this must
+			 * be done before releasing the node reference.
+			 */
+			if (bf->bf_m->m_flags & M_TXCB)
+				ieee80211_process_callback(ni, bf->bf_m,
+					ds->ds_txstat.ts_status);
+			/*
 			 * Reclaim reference to node.
 			 *
 			 * NB: the node may be reclaimed here if, for example
@@ -4332,6 +4340,7 @@
 		bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap,
 		    BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap);
+
 		m_freem(bf->bf_m);
 		bf->bf_m = NULL;
 		bf->bf_node = NULL;