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/netinet/if_ether.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/netinet/if_ether.c')
| -rw-r--r-- | sys/netinet/if_ether.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index bdc981a..a6ea36e 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -64,6 +64,9 @@ __FBSDID("$FreeBSD$"); #include <netinet/in_var.h> #include <net/if_llatbl.h> #include <netinet/if_ether.h> +#if defined(INET) || defined(INET6) +#include <netinet/ip_carp.h> +#endif #include <net/if_arc.h> #include <net/iso88025.h> @@ -118,10 +121,6 @@ static void arptimer(void *); #ifdef INET static void in_arpinput(struct mbuf *); #endif -#if defined(INET) || defined(INET6) -int (*carp_iamatch_p)(struct ifnet *, struct in_ifaddr *, struct in_addr *, - u_int8_t **); -#endif static const struct netisr_handler arp_nh = { .nh_name = "arp", |
