[src/netbsd-7]: src/sys/netinet Pull up the following revisions(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/fd7da8f5cc7a
branches:  netbsd-7
changeset: 800212:fd7da8f5cc7a
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Fri May 12 10:48:11 2017 +0000

description:
Pull up the following revisions(s) (requested by roy in ticket #1420):
        sys/netinet/ip_carp.c:  revision 1.88

carp should call if_link_state_change instead of affecting
if_link_state directly.

diffstat:

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

diffs (48 lines):

diff -r 86bc558b9eaa -r fd7da8f5cc7a sys/netinet/ip_carp.c
--- a/sys/netinet/ip_carp.c     Fri May 12 06:23:28 2017 +0000
+++ b/sys/netinet/ip_carp.c     Fri May 12 10:48:11 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_carp.c,v 1.59.2.4 2016/08/27 04:29:41 snj Exp $     */
+/*     $NetBSD: ip_carp.c,v 1.59.2.5 2017/05/12 10:48:11 sborrill 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.4 2016/08/27 04:29:41 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59.2.5 2017/05/12 10:48:11 sborrill Exp $");
 
 /*
  * TODO:
@@ -2127,6 +2127,8 @@
 carp_set_state(struct carp_softc *sc, int state)
 {
        static const char *carp_states[] = { CARP_STATES };
+       int link_state;
+
        if (sc->sc_state == state)
                return;
 
@@ -2135,16 +2137,16 @@
        sc->sc_state = state;
        switch (state) {
        case BACKUP:
-               sc->sc_if.if_link_state = LINK_STATE_DOWN;
+               link_state = LINK_STATE_DOWN;
                break;
        case MASTER:
-               sc->sc_if.if_link_state = LINK_STATE_UP;
+               link_state = LINK_STATE_UP;
                break;
        default:
-               sc->sc_if.if_link_state = LINK_STATE_UNKNOWN;
+               link_state = LINK_STATE_UNKNOWN;
                break;
        }
-       rt_ifmsg(&sc->sc_if);
+       if_link_state_change(&sc->sc_if, link_state);
 }
 
 void