From d548943ae909fff2cc91f964186d557895e14bab Mon Sep 17 00:00:00 2001
From: will <will@FreeBSD.org>
Date: Wed, 11 Aug 2010 20:18:19 +0000
Subject: 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)
---
 sys/netinet/if_ether.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'sys/netinet/if_ether.c')

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",
-- 
cgit v1.1