From owner-p4-projects  Tue Jul 30 19:46:50 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D993137B401; Tue, 30 Jul 2002 19:46:45 -0700 (PDT)
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 7A4BA37B400
	for <perforce@freebsd.org>; Tue, 30 Jul 2002 19:46:45 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3904E43E67
	for <perforce@freebsd.org>; Tue, 30 Jul 2002 19:46:45 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6V2kjJU028665
	for <perforce@freebsd.org>; Tue, 30 Jul 2002 19:46:45 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6V2kiaf028662
	for perforce@freebsd.org; Tue, 30 Jul 2002 19:46:44 -0700 (PDT)
Date: Tue, 30 Jul 2002 19:46:44 -0700 (PDT)
Message-Id: <200207310246.g6V2kiaf028662@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 15270 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://people.freebsd.org/~peter/p4db/chv.cgi?CH=15270

Change 15270 by rwatson@rwatson_paprika on 2002/07/30 19:45:52

	Remove mbuf destroys due to integ.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#12 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#12 (text+ko) ====

@@ -41,7 +41,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mac.h>
 #include <sys/mbuf.h>
@@ -78,11 +77,7 @@
 #if 0
 	KASSERT(to->m_flags & M_PKTHDR,
 	    ("m_copy_pkthdr() called on non-header"));
-#ifdef MAC
-	if (to->m_flags & M_PKTHDR)
-		mac_destroy_mbuf(to);
 #endif
-#endif
 #ifdef MAC
 	if (to->m_flags & M_PKTHDR)
 		mac_destroy_mbuf(to);
@@ -118,9 +113,6 @@
 		mac_destroy_mbuf(m);
 #endif
 		m->m_flags &= ~M_PKTHDR;
-#ifdef MAC
-		mac_destroy_mbuf(m);
-#endif
 	}
 	mn->m_next = m;
 	m = mn;

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