From 20cb9f9efe4c084e62f89e006e4d7bb42eace34e Mon Sep 17 00:00:00 2001
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Sat, 23 Sep 2000 18:50:59 +0000
Subject: Make ip6fw as loadable module.

---
 sys/netinet6/ip6_forward.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'sys/netinet6/ip6_forward.c')

diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index caa38eff1ef5..2664ccbf746d 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -62,9 +62,7 @@
 #include <netkey/key.h>
 #endif /* IPSEC */
 
-#ifdef IPV6FIREWALL
 #include <netinet6/ip6_fw.h>
-#endif
 
 #include <net/net_osdep.h>
 
@@ -415,11 +413,10 @@ ip6_forward(m, srcrt)
 	    (rt->rt_flags & (RTF_DYNAMIC|RTF_MODIFIED)) == 0)
 		type = ND_REDIRECT;
 
-#ifdef IPV6FIREWALL
 	/*
 	 * Check with the firewall...
 	 */
-	if (ip6_fw_chk_ptr) {
+	if (ip6_fw_enable && ip6_fw_chk_ptr) {
 		u_short port = 0;
 		/* If ipfw says divert, we have to just drop packet */
 		if ((*ip6_fw_chk_ptr)(&ip6, rt->rt_ifp, &port, &m)) {
@@ -429,7 +426,6 @@ ip6_forward(m, srcrt)
 		if (!m)
 			goto freecopy;
 	}
-#endif
 
 	/*
 	 * Fake scoped addresses. Note that even link-local source or
-- 
cgit v1.3