Module Name: src
Committed By: ozaki-r
Date: Tue Jan 16 07:56:55 UTC 2018
Modified Files:
src/sys/netinet6: nd6_nbr.c
Log Message:
Revert "Work around softnet_lock handling" as per pgoyette@'s request
We should avoid if (mutex_owned(softnet_lock)).
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 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.142 src/sys/netinet6/nd6_nbr.c:1.143
--- src/sys/netinet6/nd6_nbr.c:1.142 Wed Jan 10 07:34:31 2018
+++ src/sys/netinet6/nd6_nbr.c Tue Jan 16 07:56:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_nbr.c,v 1.142 2018/01/10 07:34:31 ozaki-r Exp $ */
+/* $NetBSD: nd6_nbr.c,v 1.143 2018/01/16 07:56:55 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.142 2018/01/10 07:34:31 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.143 2018/01/16 07:56:55 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1097,11 +1097,7 @@ nd6_dad_stoptimer(struct dadq *dp)
#ifdef NET_MPSAFE
callout_halt(&dp->dad_timer_ch, NULL);
#else
- /* XXX still need the trick for softnet_lock */
- if (mutex_owned(softnet_lock))
- callout_halt(&dp->dad_timer_ch, softnet_lock);
- else
- callout_halt(&dp->dad_timer_ch, NULL);
+ callout_halt(&dp->dad_timer_ch, softnet_lock);
#endif
}
