[src/trunk]: src/sys/netinet6 Revert "Work around softnet_lock handling" as p...

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5938d2e369a0
branches:  trunk
changeset: 829069:5938d2e369a0
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Tue Jan 16 07:56:55 2018 +0000

description:
Revert "Work around softnet_lock handling" as per pgoyette@'s request

We should avoid if (mutex_owned(softnet_lock)).

diffstat:

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

diffs (31 lines):

diff -r 769a868037d6 -r 5938d2e369a0 sys/netinet6/nd6_nbr.c
--- a/sys/netinet6/nd6_nbr.c    Tue Jan 16 07:53:02 2018 +0000
+++ b/sys/netinet6/nd6_nbr.c    Tue Jan 16 07:56:55 2018 +0000
@@ -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 @@
 #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
 }