Module Name: src
Committed By: bouyer
Date: Tue Mar 20 09:13:15 UTC 2018
Modified Files:
src/sys/netinet6 [netbsd-8]: nd6_nbr.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #645):
sys/netinet6/nd6_nbr.c: revision 1.153
Pull out a sleepable function (in6_selectsrc) from a pserialize read section
To generate a diff of this commit:
cvs rdiff -u -r1.138.6.4 -r1.138.6.5 src/sys/netinet6/nd6_nbr.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/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.138.6.4 src/sys/netinet6/nd6_nbr.c:1.138.6.5
--- src/sys/netinet6/nd6_nbr.c:1.138.6.4 Mon Feb 26 13:36:01 2018
+++ src/sys/netinet6/nd6_nbr.c Tue Mar 20 09:13:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_nbr.c,v 1.138.6.4 2018/02/26 13:36:01 martin Exp $ */
+/* $NetBSD: nd6_nbr.c,v 1.138.6.5 2018/03/20 09:13:15 bouyer Exp $ */
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.138.6.4 2018/02/26 13:36:01 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.138.6.5 2018/03/20 09:13:15 bouyer Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -459,12 +459,15 @@ nd6_ns_output(struct ifnet *ifp, const s
* Otherwise, we perform the source address selection as usual.
*/
s = pserialize_read_enter();
- if (hsrc && in6ifa_ifpwithaddr(ifp, hsrc))
+ if (hsrc && in6ifa_ifpwithaddr(ifp, hsrc)) {
+ pserialize_read_exit(s);
src = hsrc;
- else {
+ } else {
int error;
struct sockaddr_in6 dst_sa;
+ pserialize_read_exit(s);
+
sockaddr_in6_init(&dst_sa, &ip6->ip6_dst, 0, 0, 0);
error = in6_selectsrc(&dst_sa, NULL,
@@ -480,7 +483,6 @@ nd6_ns_output(struct ifnet *ifp, const s
}
src = &src_in;
}
- pserialize_read_exit(s);
} else {
/*
* Source address for DAD packet must always be IPv6
