From owner-p4-projects  Tue Jul 30 13: 6:41 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E73AC37B406; Tue, 30 Jul 2002 13:06:19 -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 8903637B400
	for <perforce@freebsd.org>; Tue, 30 Jul 2002 13:06:19 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0C52643E42
	for <perforce@freebsd.org>; Tue, 30 Jul 2002 13:06:19 -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 g6UK6IJU057443
	for <perforce@freebsd.org>; Tue, 30 Jul 2002 13:06:18 -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 g6UK6INI057438
	for perforce@freebsd.org; Tue, 30 Jul 2002 13:06:18 -0700 (PDT)
Date: Tue, 30 Jul 2002 13:06:18 -0700 (PDT)
Message-Id: <200207302006.g6UK6INI057438@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 15218 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=15218

Change 15218 by rwatson@rwatson_tislabs on 2002/07/30 13:06:17

	Remove duplicated code from trustedbsd_base that came in during
	the integ.

Affected files ...

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

Differences ...

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

@@ -64,6 +64,11 @@
 SYSCTL_INT(_kern_ipc, KIPC_MAX_DATALEN, max_datalen, CTLFLAG_RW,
 	   &max_datalen, 0, "");
 
+/*
+ * Copy mbuf pkthdr from "from" to "to".
+ * "from" must have M_PKTHDR set, and "to" must be empty.
+ * aux pointer will be moved to "to".
+ */
 void
 m_copy_pkthdr(struct mbuf *to, struct mbuf *from)
 {
@@ -87,25 +92,6 @@
 }
 
 /*
- * Copy mbuf pkthdr from "from" to "to".
- * "from" must have M_PKTHDR set, and "to" must be empty.
- * aux pointer will be moved to "to".
- */
-void
-m_copy_pkthdr(struct mbuf *to, struct mbuf *from)
-{
-
-#if 0
-	KASSERT(to->m_flags & M_PKTHDR,
-	    ("m_copy_pkthdr() called on non-header"));
-#endif
-	to->m_data = to->m_pktdat;
-	to->m_flags = from->m_flags & M_COPYFLAGS;
-	to->m_pkthdr = from->m_pkthdr;
-	from->m_pkthdr.aux = NULL;
-}
-
-/*
  * Lesser-used path for M_PREPEND:
  * allocate new mbuf to prepend to chain,
  * copy junk along.

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