[src/netbsd-9]: src/sys/dev/pci Pull up following revision(s) (requested by k...

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

details:   https://anonhg.NetBSD.org/src/rev/4321ce0ac9c1
branches:  netbsd-9
changeset: 843791:4321ce0ac9c1
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jan 23 10:10:57 2020 +0000

description:
Pull up following revision(s) (requested by knakahara in ticket #643):

        sys/dev/pci/if_wm.c: revision 1.661

fix softint_disestablish() in wm_detach().

ok by msaitoh@n.o
XXX pullup-8, pullup-9

diffstat:

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

diffs (28 lines):

diff -r d9d8cfebf11d -r 4321ce0ac9c1 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Thu Jan 23 10:09:01 2020 +0000
+++ b/sys/dev/pci/if_wm.c       Thu Jan 23 10:10:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.645.2.2 2019/12/11 14:48:31 martin Exp $   */
+/*     $NetBSD: if_wm.c,v 1.645.2.3 2020/01/23 10:10:57 martin Exp $   */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.2 2019/12/11 14:48:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.3 2020/01/23 10:10:57 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -3043,6 +3043,9 @@
        }
        pci_intr_release(sc->sc_pc, sc->sc_intrs, sc->sc_nintrs);
 
+       for (i = 0; i < sc->sc_nqueues; i++)
+               softint_disestablish(sc->sc_queue[i].wmq_si);
+
        wm_free_txrx_queues(sc);
 
        /* Unmap the registers */