aboutsummaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1999-04-21 18:23:00 +0000
committerPeter Wemm <peter@FreeBSD.org>1999-04-21 18:23:00 +0000
commit2cbbaa27c7dea93329f0a9e60e82f727fb544030 (patch)
treebbdede3c298db2d07650e1fdc3827f497daa538b /sys/net
parentf6e41545ea5f1c5900001e60324b6deff61cc762 (diff)
downloadsrc-2cbbaa27c7dea93329f0a9e60e82f727fb544030.tar.gz
src-2cbbaa27c7dea93329f0a9e60e82f727fb544030.zip
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)
Notes
Notes: svn path=/head/; revision=45923
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/bridge.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/net/bridge.c b/sys/net/bridge.c
index c61deaff6bd7..ecb9a999c94b 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