From 2e6c7794207eb336346939ccd9066257e4c2766a Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Wed, 21 Apr 1999 18:23:00 +0000
Subject: Fix my breakage of BRIDGE compiling option without IPFIREWALL.. (Note
 that if you have bridge compiled in and then kldload ipfw, bridge  won't
 automatically use it - knowledge of ipfw/dummynet is compiled in)

---
 sys/net/bridge.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'sys/net')

diff --git a/sys/net/bridge.c b/sys/net/bridge.c
index c61deaf..ecb9a99 100644
--- a/sys/net/bridge.c
+++ b/sys/net/bridge.c
@@ -95,11 +95,13 @@
 #include "opt_ipfw.h" 
 #include "opt_ipdn.h" 
 
-#if defined(DUMMYNET)
+#if defined(IPFIREWALL)
 #include <net/route.h>
 #include <netinet/ip_fw.h>
+#if defined(DUMMYNET)
 #include <netinet/ip_dummynet.h>
 #endif
+#endif
 
 #include <net/bridge.h>
 
@@ -480,6 +482,7 @@ bdg_forward (struct mbuf **m0, struct ifnet *dst)
 	ifp = dst ;
 	once = 1 ; /* and also canfree */
     }
+#ifdef IPFIREWALL
     /*
      * do filtering in a very similar way to what is done
      * in ip_output. Only for IP packets, and only pass/fail/dummynet
@@ -581,6 +584,7 @@ bdg_forward (struct mbuf **m0, struct ifnet *dst)
 	return 0 ;
     }
 forward:
+#endif /* IPFIREWALL */
     if (canfree && once)
 	m = *m0 ;
     else
-- 
cgit v1.1