From owner-p4-projects  Tue Dec 10 13:59:31 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0B08E37B404; Tue, 10 Dec 2002 13:59:30 -0800 (PST)
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 AC76D37B401
	for <perforce@freebsd.org>; Tue, 10 Dec 2002 13:59:29 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 59E1943EB2
	for <perforce@freebsd.org>; Tue, 10 Dec 2002 13:59:29 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBALsfmV096978
	for <perforce@freebsd.org>; Tue, 10 Dec 2002 13:54:41 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBALsfKm096975
	for perforce@freebsd.org; Tue, 10 Dec 2002 13:54:41 -0800 (PST)
Date: Tue, 10 Dec 2002 13:54:41 -0800 (PST)
Message-Id: <200212102154.gBALsfKm096975@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 22145 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 22145 by rwatson@rwatson_tislabs on 2002/12/10 13:53:48

	Variation on the KAME work-around theme.  Since we only
	conditionally free mbuf labels, mark it as already free'd
	to avoid the dup free.  An extra init could sleep.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/net/if_loop.c#14 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/net/if_loop.c#14 (text+ko) ====

@@ -234,7 +234,7 @@
 		 * primitives are used for relocating mbuf header
 		 * data, this will no longer be required.
 		 */
-		mac_init_mbuf(m, M_WAITOK);
+		m->m_pkthdr.label.l_flags &= ~MAC_FLAG_INITIALIZED;
 #endif
 		m_freem(m);
 		m = n;

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message