From f9bc841320c631b24281c6561466509a4771b0f0 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 20 Apr 1999 13:32:06 +0000 Subject: Tidy up some stray / unused stuff in the IPFW package and friends. - unifdef -DCOMPAT_IPFW (this was on by default already) - remove traces of in-kernel ip_nat package, it was never committed. - Make IPFW and DUMMYNET initialize themselves rather than depend on compiled-in hooks in ip_init(). This means they initialize the same way both in-kernel and as kld modules. (IPFW initializes now :-) --- sys/net/bridge.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'sys/net') diff --git a/sys/net/bridge.c b/sys/net/bridge.c index 64f6aad..c61deaf 100644 --- a/sys/net/bridge.c +++ b/sys/net/bridge.c @@ -95,7 +95,7 @@ #include "opt_ipfw.h" #include "opt_ipdn.h" -#if defined(IPFIREWALL) && defined(DUMMYNET) +#if defined(DUMMYNET) #include #include #include @@ -480,7 +480,6 @@ 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 @@ -582,7 +581,6 @@ bdg_forward (struct mbuf **m0, struct ifnet *dst) return 0 ; } forward: -#endif /* COMPAT_IPFW */ if (canfree && once) m = *m0 ; else -- cgit v1.1