From owner-svn-src-user@FreeBSD.ORG  Fri Nov 21 04:41:53 2008
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 96DEE1065670;
	Fri, 21 Nov 2008 04:41:53 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8081C8FC1A;
	Fri, 21 Nov 2008 04:41:53 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAL4fr24074058;
	Fri, 21 Nov 2008 04:41:53 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAL4frTb074057;
	Fri, 21 Nov 2008 04:41:53 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200811210441.mAL4frTb074057@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Fri, 21 Nov 2008 04:41:53 +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: r185143 -
	user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/sys
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: Fri, 21 Nov 2008 04:41:53 -0000

Author: kmacy
Date: Fri Nov 21 04:41:53 2008
New Revision: 185143
URL: http://svn.freebsd.org/changeset/base/185143

Log:
  centralize free of mbuf tags

Modified:
  user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/sys/uipc_mvec.c

Modified: user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/sys/uipc_mvec.c
==============================================================================
--- user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/sys/uipc_mvec.c	Fri Nov 21 04:38:20 2008	(r185142)
+++ user/kmacy/HEAD_fast_multi_xmit/sys/dev/cxgb/sys/uipc_mvec.c	Fri Nov 21 04:41:53 2008	(r185143)
@@ -128,6 +128,8 @@ _mcl_collapse_mbuf(struct mbuf_iovec *mi
 #ifdef IFNET_MULTIQ		
 		mi->mi_rss_hash = m->m_pkthdr.rss_hash;
 #endif		
+		if(!SLIST_EMPTY(&m->m_pkthdr.tags)) 
+			m_tag_delete_chain(m, NULL);
 	}
 	if (m->m_type != MT_DATA) {
 		mi->mi_data = NULL;
@@ -201,9 +203,6 @@ busdma_map_sg_collapse(struct mbuf **m, 
 
 	KASSERT(n->m_pkthdr.len, ("packet has zero header len"));
 		
-	if (n->m_flags & M_PKTHDR && !SLIST_EMPTY(&n->m_pkthdr.tags)) 
-		m_tag_delete_chain(n, NULL);
-
 	if (n->m_pkthdr.len <= PIO_LEN)
 		return (0);
 retry:
@@ -319,9 +318,6 @@ busdma_map_sg_vec(struct mbuf **m, struc
 	mv->mv_first = 0;
 	for (mp = m, i = 0, mi = mv->mv_vec; i < pkt_count;
 	     mp++, segs++, mi++, i++) {
-		if ((*mp)->m_flags & M_PKTHDR
-		    && !SLIST_EMPTY(&(*mp)->m_pkthdr.tags)) 
-			m_tag_delete_chain(*mp, NULL);
 		busdma_map_mbuf_fast(*mp, segs);
 		_mcl_collapse_mbuf(mi, *mp);
 		KASSERT(mi->mi_len, ("empty packet"));