Module Name: src Committed By: snj Date: Sat Aug 27 04:25:50 UTC 2016
Modified Files: src/sys/netinet [netbsd-7]: ip_carp.c Log Message: Pull up following revision(s) (requested by is in ticket #1208): sys/netinet/ip_carp.c: revision 1.75 Workaround for PR 47013 by bouyer@. Only works for mixed IPv4/IPv6 environemnts, not for pure-IPv6 yet. A real fix is still needed. To generate a diff of this commit: cvs rdiff -u -r1.59.2.2 -r1.59.2.3 src/sys/netinet/ip_carp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/netinet/ip_carp.c diff -u src/sys/netinet/ip_carp.c:1.59.2.2 src/sys/netinet/ip_carp.c:1.59.2.3 --- src/sys/netinet/ip_carp.c:1.59.2.2 Sat Jul 23 13:33:32 2016 +++ src/sys/netinet/ip_carp.c Sat Aug 27 04:25:50 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_carp.c,v 1.59.2.2 2016/07/23 13:33:32 is Exp $ */ +/* $NetBSD: ip_carp.c,v 1.59.2.3 2016/08/27 04:25:50 snj Exp $ */ /* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */ /* @@ -31,7 +31,7 @@ #include "opt_mbuftrace.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59.2.2 2016/07/23 13:33:32 is Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59.2.3 2016/08/27 04:25:50 snj Exp $"); /* * TODO: @@ -1067,7 +1067,7 @@ carp_send_ad(void *v) } } #endif /* INET */ -#ifdef INET6 +#ifdef INET6_notyet if (sc->sc_naddrs6) { struct ip6_hdr *ip6; @@ -1475,7 +1475,7 @@ carp_setrun(struct carp_softc *sc, sa_fa callout_schedule(&sc->sc_md_tmo, tvtohz(&tv)); break; #endif /* INET */ -#ifdef INET6 +#ifdef INET6_notyet case AF_INET6: callout_schedule(&sc->sc_md6_tmo, tvtohz(&tv)); break; @@ -1483,8 +1483,10 @@ carp_setrun(struct carp_softc *sc, sa_fa default: if (sc->sc_naddrs) callout_schedule(&sc->sc_md_tmo, tvtohz(&tv)); +#ifdef INET6_notyet if (sc->sc_naddrs6) callout_schedule(&sc->sc_md6_tmo, tvtohz(&tv)); +#endif /* INET6 */ break; } break;