Module Name: src
Committed By: knakahara
Date: Tue Jan 10 08:22:43 UTC 2017
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
sc->sc_core_stopping must be checked with holding sc_core_lock.
pointed out by ozaki-r@n.o, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.462 -r1.463 src/sys/dev/pci/if_wm.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/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.462 src/sys/dev/pci/if_wm.c:1.463
--- src/sys/dev/pci/if_wm.c:1.462 Fri Jan 6 08:05:26 2017
+++ src/sys/dev/pci/if_wm.c Tue Jan 10 08:22:43 2017
@@ -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 @@ wm_tick(void *arg)
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
