Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci Use callout_halt() instead of callout_stop for s...



details:   https://anonhg.NetBSD.org/src/rev/105d33c92e63
branches:  trunk
changeset: 745210:105d33c92e63
user:      yamaguchi <yamaguchi%NetBSD.org@localhost>
date:      Tue Feb 25 07:45:28 2020 +0000

description:
Use callout_halt() instead of callout_stop for safety

pointed out and reviewed by knakahara@n.o., thanks

diffstat:

 sys/dev/pci/if_ixl.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 9567d5d54562 -r 105d33c92e63 sys/dev/pci/if_ixl.c
--- a/sys/dev/pci/if_ixl.c      Tue Feb 25 07:41:32 2020 +0000
+++ b/sys/dev/pci/if_ixl.c      Tue Feb 25 07:45:28 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ixl.c,v 1.50 2020/02/25 07:41:32 yamaguchi Exp $    */
+/*     $NetBSD: if_ixl.c,v 1.51 2020/02/25 07:45:28 yamaguchi Exp $    */
 
 /*
  * Copyright (c) 2013-2015, Intel Corporation
@@ -74,7 +74,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.50 2020/02/25 07:41:32 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.51 2020/02/25 07:45:28 yamaguchi Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -1518,7 +1518,7 @@
 
        ixl_disable_other_intr(sc);
 
-       callout_stop(&sc->sc_stats_callout);
+       callout_halt(&sc->sc_stats_callout, NULL);
        ixl_work_wait(sc->sc_workq, &sc->sc_stats_task);
 
        /* wait for ATQ handler */



Home | Main Index | Thread Index | Old Index