From owner-trustedbsd-cvs@FreeBSD.ORG  Fri Oct 27 07:15:45 2006
Return-Path: <owner-trustedbsd-cvs@FreeBSD.ORG>
X-Original-To: trustedbsd-cvs@freebsd.org
Delivered-To: trustedbsd-cvs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A0B5116A407
	for <trustedbsd-cvs@freebsd.org>; Fri, 27 Oct 2006 07:15:45 +0000 (UTC)
	(envelope-from owner-perforce@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F3F8743D49
	for <trustedbsd-cvs@freebsd.org>; Fri, 27 Oct 2006 07:15:44 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119])
	by cyrus.watson.org (Postfix) with ESMTP id E4A1246EB7
	for <trustedbsd-cvs@trustedbsd.org>;
	Fri, 27 Oct 2006 03:15:44 -0400 (EDT)
Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18])
	by mx2.freebsd.org (Postfix) with ESMTP id 82D69556C3;
	Fri, 27 Oct 2006 07:15:31 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 796BE16A47B; Fri, 27 Oct 2006 07:15:31 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 559AB16A415
	for <perforce@freebsd.org>; Fri, 27 Oct 2006 07:15:31 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8698343D5C
	for <perforce@freebsd.org>; Fri, 27 Oct 2006 07:15:30 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9R7FUV6055966
	for <perforce@freebsd.org>; Fri, 27 Oct 2006 07:15:30 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9R7FUWx055963
	for perforce@freebsd.org; Fri, 27 Oct 2006 07:15:30 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 27 Oct 2006 07:15:30 GMT
Message-Id: <200610270715.k9R7FUWx055963@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>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 108554 for review
X-BeenThere: trustedbsd-cvs@FreeBSD.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: TrustedBSD CVS and Perforce commit message list
	<trustedbsd-cvs.FreeBSD.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>, 
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/trustedbsd-cvs>
List-Post: <mailto:trustedbsd-cvs@FreeBSD.org>
List-Help: <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Oct 2006 07:15:45 -0000

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

Change 108554 by rwatson@rwatson_zoo on 2006/10/27 07:14:38

	Update for mac_framework.h.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/net/if_spppsubr.c#29 edit
.. //depot/projects/trustedbsd/mac/sys/net/ppp_deflate.c#11 edit

Differences ...

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

@@ -47,7 +47,6 @@
 #if defined(__FreeBSD__) && __FreeBSD__ >= 3
 #include <sys/random.h>
 #endif
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 
@@ -96,6 +95,10 @@
 
 #include <net/if_sppp.h>
 
+#if defined(__FreeBSD__) && __FreeBSD__ >= 7
+#include <security/mac/mac_framework.h>
+#endif
+
 #if defined(__FreeBSD__) && __FreeBSD__ >= 3
 # define IOCTL_CMD_T	u_long
 #else

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

@@ -34,7 +34,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
@@ -46,6 +45,8 @@
 #define PACKETPTR	struct mbuf *
 #include <net/ppp_comp.h>
 
+#include <security/mac/mac_framework.h>
+
 #define DEFLATE_DEBUG	1
 
 /*