diff options
| author | will <will@FreeBSD.org> | 2010-08-11 20:18:19 +0000 |
|---|---|---|
| committer | will <will@FreeBSD.org> | 2010-08-11 20:18:19 +0000 |
| commit | d548943ae909fff2cc91f964186d557895e14bab (patch) | |
| tree | 04a9bbb85e9f7f4a28b5bef19bf56f932ebf0ea4 /sys/net/if_bridge.c | |
| parent | 9198b19835979cee1b431f818f01d9859c25f48f (diff) | |
| download | FreeBSD-src-d548943ae909fff2cc91f964186d557895e14bab.zip FreeBSD-src-d548943ae909fff2cc91f964186d557895e14bab.tar.gz | |
Unbreak LINT by moving all carp hooks to net/if.c / netinet/ip_carp.h, with
the appropriate ifdefs.
Reviewed by: bz
Approved by: ken (mentor)
Diffstat (limited to 'sys/net/if_bridge.c')
| -rw-r--r-- | sys/net/if_bridge.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index fb04731..5ac4ef0 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -2141,10 +2141,6 @@ drop: m_freem(m); } -#if defined(INET) || defined(INET6) -int (*carp_forus_p)(struct carp_if *, u_char *); -#endif - /* * bridge_input: * @@ -2256,10 +2252,10 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) #if (defined(INET) || defined(INET6)) # define OR_CARP_CHECK_WE_ARE_DST(iface) \ || ((iface)->if_carp \ - && (*carp_forus_p)((iface)->if_carp, eh->ether_dhost)) + && (*carp_forus_p)((iface), eh->ether_dhost)) # define OR_CARP_CHECK_WE_ARE_SRC(iface) \ || ((iface)->if_carp \ - && (*carp_forus_p)((iface)->if_carp, eh->ether_shost)) + && (*carp_forus_p)((iface), eh->ether_shost)) #else # define OR_CARP_CHECK_WE_ARE_DST(iface) # define OR_CARP_CHECK_WE_ARE_SRC(iface) |
