Module Name: src
Committed By: ozaki-r
Date: Thu Mar 14 07:05:07 UTC 2019
Modified Files:
src/sys/netinet: ip_carp.c
Log Message:
carp: don't skip pserialize_read_enter and ifa_release
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 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.101 src/sys/netinet/ip_carp.c:1.102
--- src/sys/netinet/ip_carp.c:1.101 Sat Dec 22 14:28:57 2018
+++ src/sys/netinet/ip_carp.c Thu Mar 14 07:05:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.101 2018/12/22 14:28:57 maxv Exp $ */
+/* $NetBSD: ip_carp.c,v 1.102 2019/03/14 07:05:07 ozaki-r 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.101 2018/12/22 14:28:57 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.102 2019/03/14 07:05:07 ozaki-r 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);
}
