[src/netbsd-7]: src/sys/netinet Pull up following revision(s) (requested by i...

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

details:   https://anonhg.NetBSD.org/src/rev/c51a368eb994
branches:  netbsd-7
changeset: 799952:c51a368eb994
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Aug 27 04:25:50 2016 +0000

description:
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.

diffstat:

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

diffs (47 lines):

diff -r 1a1d12a1d8de -r c51a368eb994 sys/netinet/ip_carp.c
--- a/sys/netinet/ip_carp.c     Sat Jul 23 13:33:32 2016 +0000
+++ b/sys/netinet/ip_carp.c     Sat Aug 27 04:25:50 2016 +0000
@@ -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 @@
                }
        }
 #endif /* INET */
-#ifdef INET6
+#ifdef INET6_notyet
        if (sc->sc_naddrs6) {
                struct ip6_hdr *ip6;
 
@@ -1475,7 +1475,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;
@@ -1483,8 +1483,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;