From 46e3b1cbe7f4fd129bda4f68410681078add7f38 Mon Sep 17 00:00:00 2001
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 27 Jun 2004 09:03:22 +0000
Subject: [PATCH] Add two missing includes and remove two uneeded. This is
 quite serious fix, because even with MAC framework compiled in, MAC entry
 points in those two files were simply ignored.

---
 sys/kern/kern_jail.c     | 3 +++
 sys/net/if_fwsubr.c      | 2 ++
 sys/net/if_loop.c        | 1 -
 sys/netinet/ip_fastfwd.c | 1 -
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index d3c55ce3a3c4..140dc08113c7 100644
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@@ -10,12 +10,15 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_mac.h"
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/sysproto.h>
+#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/taskqueue.h>
diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c
index 7232583fd3c8..1989c4e71c7b 100644
--- a/sys/net/if_fwsubr.c
+++ b/sys/net/if_fwsubr.c
@@ -32,10 +32,12 @@
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_mac.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index ba7508ee779c..0c266ce71b4c 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -38,7 +38,6 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipx.h"
-#include "opt_mac.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c
index a73c499e17d9..ea14dcea4ca8 100644
--- a/sys/netinet/ip_fastfwd.c
+++ b/sys/netinet/ip_fastfwd.c
@@ -80,7 +80,6 @@
 #include "opt_ipdivert.h"
 #include "opt_ipfilter.h"
 #include "opt_ipstealth.h"
-#include "opt_mac.h"
 #include "opt_pfil_hooks.h"
 
 #include <sys/param.h>