Module Name: src
Committed By: martin
Date: Thu Jan 23 10:17:42 UTC 2020
Modified Files:
src/sys/dev/pci [netbsd-8]: if_wm.c
Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1488):
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
To generate a diff of this commit:
cvs rdiff -u -r1.508.4.36 -r1.508.4.37 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.508.4.36 src/sys/dev/pci/if_wm.c:1.508.4.37
--- src/sys/dev/pci/if_wm.c:1.508.4.36 Wed Nov 6 10:23:06 2019
+++ src/sys/dev/pci/if_wm.c Thu Jan 23 10:17:41 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.508.4.36 2019/11/06 10:23:06 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.508.4.37 2020/01/23 10:17:41 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.508.4.36 2019/11/06 10:23:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.37 2020/01/23 10:17:41 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -3017,6 +3017,9 @@ wm_detach(device_t self, int flags __unu
}
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 */
