Module Name: src
Committed By: ozaki-r
Date: Mon Mar 19 03:14:08 UTC 2018
Modified Files:
src/sys/netinet6: nd6_nbr.c
Log Message:
Pull out a sleepable function (in6_selectsrc) from a pserialize read section
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 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.152 src/sys/netinet6/nd6_nbr.c:1.153
--- src/sys/netinet6/nd6_nbr.c:1.152 Thu Mar 8 06:48:23 2018
+++ src/sys/netinet6/nd6_nbr.c Mon Mar 19 03:14:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_nbr.c,v 1.152 2018/03/08 06:48:23 ozaki-r Exp $ */
+/* $NetBSD: nd6_nbr.c,v 1.153 2018/03/19 03:14:08 ozaki-r 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.152 2018/03/08 06:48:23 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.153 2018/03/19 03:14:08 ozaki-r 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
