Module Name: src
Committed By: martin
Date: Tue Mar 19 13:42:55 UTC 2019
Modified Files:
src/sys/netinet [netbsd-8]: ip_carp.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.90.2.3 -r1.90.2.4 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.90.2.3 src/sys/netinet/ip_carp.c:1.90.2.4
--- src/sys/netinet/ip_carp.c:1.90.2.3 Tue Jan 2 10:20:34 2018
+++ src/sys/netinet/ip_carp.c Tue Mar 19 13:42:54 2019
@@ -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 @@ carp_setroute(struct carp_softc *sc, int
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 @@ carp_setroute(struct carp_softc *sc, int
default:
break;
}
+ next:
s = pserialize_read_enter();
ifa_release(ifa, &psref);
}
