Module Name: src
Committed By: ozaki-r
Date: Mon Apr 11 01:16:20 UTC 2016
Modified Files:
src/sys/netinet6: nd6_nbr.c
Log Message:
Don't call pfxlist_onlink_check with holding llentry lock
>From FreeBSD (as of 2016-04-11).
Should fix PR kern/51060.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 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.115 src/sys/netinet6/nd6_nbr.c:1.116
--- src/sys/netinet6/nd6_nbr.c:1.115 Mon Apr 4 07:37:07 2016
+++ src/sys/netinet6/nd6_nbr.c Mon Apr 11 01:16:20 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_nbr.c,v 1.115 2016/04/04 07:37:07 ozaki-r Exp $ */
+/* $NetBSD: nd6_nbr.c,v 1.116 2016/04/11 01:16:20 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.115 2016/04/04 07:37:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.116 2016/04/11 01:16:20 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -547,6 +547,7 @@ nd6_na_input(struct mbuf *m, int off, in
union nd_opts ndopts;
struct sockaddr_in6 ssin6;
int rt_announce;
+ bool checklink = false;
if (ip6->ip6_hlim != 255) {
nd6log(LOG_ERR,
@@ -675,7 +676,7 @@ nd6_na_input(struct mbuf *m, int off, in
* non-reachable to probably reachable, and might
* affect the status of associated prefixes..
*/
- pfxlist_onlink_check();
+ checklink = true;
}
} else {
int llchange;
@@ -808,6 +809,9 @@ nd6_na_input(struct mbuf *m, int off, in
if (ln != NULL)
LLE_WUNLOCK(ln);
+ if (checklink)
+ pfxlist_onlink_check();
+
m_freem(m);
return;
