diff options
author | peter <peter@FreeBSD.org> | 1999-04-20 13:32:06 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-04-20 13:32:06 +0000 |
commit | f9bc841320c631b24281c6561466509a4771b0f0 (patch) | |
tree | cf383e55c2da8227f5f29a904f4e3686a7cf73c5 /sys/net/bridge.c | |
parent | 5bfc6b1d275f04b0232db26413bbd022a3b535bd (diff) | |
download | FreeBSD-src-f9bc841320c631b24281c6561466509a4771b0f0.zip FreeBSD-src-f9bc841320c631b24281c6561466509a4771b0f0.tar.gz |
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 :-)
Diffstat (limited to 'sys/net/bridge.c')
-rw-r--r-- | sys/net/bridge.c | 4 |
1 files changed, 1 insertions, 3 deletions
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 <net/route.h> #include <netinet/ip_fw.h> #include <netinet/ip_dummynet.h> @@ -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 |