[src/trunk]: src/sys/netinet Workaround for PR 47013 by bouyer@. Only works f...

[is <is%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0b9b70e7b0c3
branches:  trunk
changeset: 816770:0b9b70e7b0c3
user:      is <is%NetBSD.org@localhost>
date:      Sat Jul 23 12:19:07 2016 +0000

description:
Workaround for PR 47013 by bouyer@. Only works for mixed IPv4/IPv6
environemnts, not for pure-IPv6 yet. A real fix is still needed.

diffstat:

 sys/netinet/ip_carp.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r 1ec57af8bbd5 -r 0b9b70e7b0c3 sys/netinet/ip_carp.c
--- a/sys/netinet/ip_carp.c     Sat Jul 23 06:48:27 2016 +0000
+++ b/sys/netinet/ip_carp.c     Sat Jul 23 12:19:07 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_carp.c,v 1.74 2016/07/07 09:32:02 ozaki-r Exp $     */
+/*     $NetBSD: ip_carp.c,v 1.75 2016/07/23 12:19:07 is Exp $  */
 /*     $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $   */
 
 /*
@@ -33,7 +33,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.74 2016/07/07 09:32:02 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.75 2016/07/23 12:19:07 is Exp $");
 
 /*
  * TODO:
@@ -1086,7 +1086,7 @@
                }
        }
 #endif /* INET */
-#ifdef INET6
+#ifdef INET6_notyet
        if (sc->sc_naddrs6) {
                struct ip6_hdr *ip6;
 
@@ -1494,7 +1494,7 @@
                        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;
@@ -1502,8 +1502,10 @@
                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;