--- src/sys/netinet6/in6_proto.c	2007/05/07 12:40:30	1.12
+++ src/sys/netinet6/in6_proto.c	2007/08/16 20:03:58	1.13
@@ -69,6 +69,7 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
+#include "opt_carp.h"
 
 #include <sys/param.h>
 #include <sys/socket.h>
@@ -140,6 +141,11 @@
 
 #include <net/net_osdep.h>
 
+#ifdef CARP
+#include <netinet/ip_carp.h>
+#endif
+
+
 /*
  * TCP/IP protocol family: IP6, ICMP6, UDP, TCP.
  */
@@ -247,6 +253,15 @@ struct ip6protosw inet6sw[] = {
   0,            0,              0,              0,
   &rip6_usrreqs
 },
+#ifdef CARP
+{ SOCK_RAW,    &inet6domain,   IPPROTO_CARP,   PR_ATOMIC|PR_ADDR,
+  carp6_input, rip6_output,    0,              rip6_ctloutput,
+  0,
+  0,            0,              0,              0,
+  &rip6_usrreqs
+},
+#endif /* CARP */
+
 /* raw wildcard */
 { SOCK_RAW,	&inet6domain,	0,		PR_ATOMIC|PR_ADDR,
   rip6_input,	rip6_output,	0,		rip6_ctloutput,