From owner-p4-projects@FreeBSD.ORG  Sat Nov 26 00:56:32 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 1F0D216A477; Sat, 26 Nov 2005 00:56:31 +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 BFD0C16A44C
	for <perforce@freebsd.org>; Sat, 26 Nov 2005 00:56:30 +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 810E943DB0
	for <perforce@freebsd.org>; Sat, 26 Nov 2005 00:56:11 +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 jAQ0u8Ln015429
	for <perforce@freebsd.org>; Sat, 26 Nov 2005 00:56:08 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAQ0u8U0015426
	for perforce@freebsd.org; Sat, 26 Nov 2005 00:56:08 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 26 Nov 2005 00:56:08 GMT
Message-Id: <200511260056.jAQ0u8U0015426@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 87234 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:56:33 -0000

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

Change 87234 by sam@sam_ebb on 2005/11/26 00:55:44

	honor tx complete callbacks (not needed for now as mgt frames
	are done in firmware)

Affected files ...

.. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#10 edit
.. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#12 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#10 (text+ko) ====

@@ -1184,6 +1184,8 @@
 		bus_dmamap_unload(sc->txbuf_dmat, sbuf->map);
 		SLIST_INSERT_HEAD(&sc->free_sbuf, sbuf, next);
 
+		if (sbuf->m->m_flags & M_TXCB)
+			ieee80211_process_callback(sbuf->ni, sbuf->m, 0/*XXX*/);
 		m_freem(sbuf->m);
 		ieee80211_free_node(sbuf->ni);
 

==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#12 (text+ko) ====

@@ -1398,6 +1398,8 @@
 		bus_dmamap_sync(txq->data_dmat, data->map,
 		    BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(txq->data_dmat, data->map);
+		if (data->m->m_flags & M_TXCB)
+			ieee80211_process_callback(data->ni, data->m, 0/*XXX*/);
 		m_freem(data->m);
 		data->m = NULL;
 		ieee80211_free_node(data->ni);