diff options
| author | bz <bz@FreeBSD.org> | 2009-06-11 10:26:38 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2009-06-11 10:26:38 +0000 |
| commit | fe42112add1a5987e8d66b6177ed78fe3d5e5749 (patch) | |
| tree | f98bbcd30eb93d910b0d5de7940c01d2a7e71764 /sys/net/if_bridge.c | |
| parent | 06bce6ca23b25ef22dfc3bccf917d0d8704287ba (diff) | |
| download | FreeBSD-src-fe42112add1a5987e8d66b6177ed78fe3d5e5749.zip FreeBSD-src-fe42112add1a5987e8d66b6177ed78fe3d5e5749.tar.gz | |
carp(4) allows people to share a set of IP addresses and can only
use IPv4/v6 for inter-node communication (according to my reading).
Properly wrap the carp callouts in INET || INET6 and refelect this
in sys/conf/files as well. While in theory this should be ok,
it might be a bit optimistic to think that carp could build with
inet6 only[1].
Discussed with: mlaier [1]
Diffstat (limited to 'sys/net/if_bridge.c')
| -rw-r--r-- | sys/net/if_bridge.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index db2f617..08310d7 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -122,9 +122,11 @@ __FBSDID("$FreeBSD$"); #include <netinet6/ip6_var.h> #include <netinet6/vinet6.h> #endif +#if defined(INET) || defined(INET6) #ifdef DEV_CARP #include <netinet/ip_carp.h> #endif +#endif #include <machine/in_cksum.h> #include <netinet/if_ether.h> /* for struct arpcom */ #include <net/bridgestp.h> @@ -2231,7 +2233,7 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) return (m); } -#ifdef DEV_CARP +#if (defined(INET) || defined(INET6)) && defined(DEV_CARP) # define OR_CARP_CHECK_WE_ARE_DST(iface) \ || ((iface)->if_carp \ && carp_forus((iface)->if_carp, eh->ether_dhost)) |
