Module Name: src
Committed By: mlelstv
Date: Tue Nov 15 21:17:07 UTC 2016
Modified Files:
src/sys/netinet6: nd6_nbr.c
Log Message:
nd6_dad_duplicated takes the lock itself. Move it out of the critical
section.
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 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.129 src/sys/netinet6/nd6_nbr.c:1.130
--- src/sys/netinet6/nd6_nbr.c:1.129 Mon Oct 31 04:16:25 2016
+++ src/sys/netinet6/nd6_nbr.c Tue Nov 15 21:17:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_nbr.c,v 1.129 2016/10/31 04:16:25 ozaki-r Exp $ */
+/* $NetBSD: nd6_nbr.c,v 1.130 2016/11/15 21:17:07 mlelstv 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.129 2016/10/31 04:16:25 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.130 2016/11/15 21:17:07 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1229,6 +1229,7 @@ nd6_dad_timer(struct ifaddr *ifa)
{
struct in6_ifaddr *ia = (struct in6_ifaddr *)ifa;
struct dadq *dp;
+ int duplicate = 0;
#ifndef NET_MPSAFE
mutex_enter(softnet_lock);
@@ -1286,10 +1287,6 @@ nd6_dad_timer(struct ifaddr *ifa)
* We have transmitted sufficient number of DAD packets.
* See what we've got.
*/
- int duplicate;
-
- duplicate = 0;
-
if (dp->dad_na_icount) {
/*
* the check is in nd6_dad_na_input(),
@@ -1306,7 +1303,6 @@ nd6_dad_timer(struct ifaddr *ifa)
if (duplicate) {
/* (*dp) will be freed in nd6_dad_duplicated() */
dp = NULL;
- nd6_dad_duplicated(ifa);
} else {
/*
* We are done with DAD. No NA came, no NS came.
@@ -1329,6 +1325,10 @@ nd6_dad_timer(struct ifaddr *ifa)
done:
mutex_exit(&nd6_dad_lock);
+
+ if (duplicate)
+ nd6_dad_duplicated(ifa);
+
#ifndef NET_MPSAFE
KERNEL_UNLOCK_ONE(NULL);
mutex_exit(softnet_lock);
