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

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

details:   https://anonhg.NetBSD.org/src/rev/836f3d215f1e
branches:  netbsd-8
changeset: 851500:836f3d215f1e
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Tue Mar 20 09:13:15 2018 +0000

description:
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

diffstat:

 sys/netinet6/nd6_nbr.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 87a73a15b32a -r 836f3d215f1e sys/netinet6/nd6_nbr.c
--- a/sys/netinet6/nd6_nbr.c    Tue Mar 20 09:10:57 2018 +0000
+++ b/sys/netinet6/nd6_nbr.c    Tue Mar 20 09:13:15 2018 +0000
@@ -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 @@
                 * 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 @@
                        }
                        src = &src_in;
                }
-               pserialize_read_exit(s);
        } else {
                /*
                 * Source address for DAD packet must always be IPv6