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)
This commit is contained in:
peter 1999-04-21 18:23:00 +00:00
parent 947085f708
commit 2e6c779420

View File

@ -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