[src/trunk]: src/sys/dev/pci sc->sc_core_stopping must be checked with holdin...

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

details:   https://anonhg.NetBSD.org/src/rev/a6c3b25d4a57
branches:  trunk
changeset: 820458:a6c3b25d4a57
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Tue Jan 10 08:22:43 2017 +0000

description:
sc->sc_core_stopping must be checked with holding sc_core_lock.

pointed out by ozaki-r@n.o, thanks.

diffstat:

 sys/dev/pci/if_wm.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r 7815b19596b4 -r a6c3b25d4a57 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Tue Jan 10 07:39:52 2017 +0000
+++ b/sys/dev/pci/if_wm.c       Tue Jan 10 08:22:43 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.462 2017/01/06 08:05:26 msaitoh Exp $      */
+/*     $NetBSD: if_wm.c,v 1.463 2017/01/10 08:22:43 knakahara Exp $    */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.462 2017/01/06 08:05:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.463 2017/01/10 08:22:43 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -2877,14 +2877,12 @@
        else
                wm_tbi_tick(sc);
 
+       callout_reset(&sc->sc_tick_ch, hz, wm_tick, sc);
 out:
        WM_CORE_UNLOCK(sc);
 #ifndef WM_MPSAFE
        splx(s);
 #endif
-
-       if (!sc->sc_core_stopping)
-               callout_reset(&sc->sc_tick_ch, hz, wm_tick, sc);
 }
 
 static int