From owner-p4-projects@FreeBSD.ORG  Fri Apr 18 13:26:12 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D0AC337B405; Fri, 18 Apr 2003 13:26:11 -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 70ED537B401
	for <perforce@freebsd.org>; Fri, 18 Apr 2003 13:26:11 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 009D943FD7
	for <perforce@freebsd.org>; Fri, 18 Apr 2003 13:26:11 -0700 (PDT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3IKQA0U035778
	for <perforce@freebsd.org>; Fri, 18 Apr 2003 13:26:10 -0700 (PDT)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3IKQAdk035774
	for perforce@freebsd.org; Fri, 18 Apr 2003 13:26:10 -0700 (PDT)
Date: Fri, 18 Apr 2003 13:26:10 -0700 (PDT)
Message-Id: <200304182026.h3IKQAdk035774@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 29216 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Fri, 18 Apr 2003 20:26:13 -0000

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

Change 29216 by jhb@jhb_laptop on 2003/04/18 13:26:04

	IFC.

Affected files ...

.. //depot/projects/smpng/sys/security/mac_ifoff/mac_ifoff.c#4 integrate

Differences ...

==== //depot/projects/smpng/sys/security/mac_ifoff/mac_ifoff.c#4 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/mac_ifoff/mac_ifoff.c,v 1.5 2003/03/27 19:26:38 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac_ifoff/mac_ifoff.c,v 1.6 2003/04/18 20:22:23 rwatson Exp $
  */
 
 /*
@@ -147,10 +147,9 @@
     struct mbuf *m, struct label *mbuflabel)
 {
 
-	if (m->m_flags & M_PKTHDR) {
-		if (m->m_pkthdr.rcvif != NULL)
-			return (check_ifnet_incoming(m->m_pkthdr.rcvif, 0));
-	}
+	M_ASSERTPKTHDR(m);
+	if (m->m_pkthdr.rcvif != NULL)
+		return (check_ifnet_incoming(m->m_pkthdr.rcvif, 0));
 
 	return (0);
 }