Module Name: src Committed By: sborrill Date: Fri May 12 10:48:11 UTC 2017
Modified Files: src/sys/netinet [netbsd-7]: ip_carp.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.59.2.4 -r1.59.2.5 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.4 src/sys/netinet/ip_carp.c:1.59.2.5 --- src/sys/netinet/ip_carp.c:1.59.2.4 Sat Aug 27 04:29:41 2016 +++ src/sys/netinet/ip_carp.c Fri May 12 10:48:11 2017 @@ -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 @@ static void 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 @@ carp_set_state(struct carp_softc *sc, in 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