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

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

details:   https://anonhg.NetBSD.org/src/rev/4b460c97842e
branches:  netbsd-8
changeset: 449747:4b460c97842e
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Mar 19 13:42:54 2019 +0000

description:
Pull up following revision(s) (requested by ozaki-r in ticket #1218):

        sys/netinet/ip_carp.c: revision 1.102

carp: don't skip pserialize_read_enter and ifa_release

diffstat:

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

diffs (35 lines):

diff -r e87054a3ab59 -r 4b460c97842e sys/netinet/ip_carp.c
--- a/sys/netinet/ip_carp.c     Fri Mar 15 14:51:53 2019 +0000
+++ b/sys/netinet/ip_carp.c     Tue Mar 19 13:42:54 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_carp.c,v 1.90.2.3 2018/01/02 10:20:34 snj Exp $     */
+/*     $NetBSD: ip_carp.c,v 1.90.2.4 2019/03/19 13:42:54 martin 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.90.2.3 2018/01/02 10:20:34 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.90.2.4 2019/03/19 13:42:54 martin Exp $");
 
 /*
  * TODO:
@@ -410,7 +410,7 @@
                                    ifatoia(ifa), CARP_COUNT_MASTER);
                                if ((cmd == RTM_ADD && count != 1) ||
                                    (cmd == RTM_DELETE && count != 0))
-                                       continue;
+                                       goto next;
                        }
 
                        /* Remove the existing host route, if any */
@@ -485,6 +485,7 @@
                default:
                        break;
                }
+       next:
                s = pserialize_read_enter();
                ifa_release(ifa, &psref);
        }