Module Name: src
Committed By: jdolecek
Date: Sat Aug 11 10:34:25 UTC 2018
Modified Files:
src/sys/arch/xen/xen: xennetback_xenbus.c
Log Message:
disestablish interrupt handler regardless of the state whenever it was
setup, i.e. also when the instance is DISCONNECTING already
fixes PR port-xen/53487 by Bert Kiers; fix found and reported by
Dennis Lindroos
XXX pullup netbsd-8
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/xen/xen/xennetback_xenbus.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/arch/xen/xen/xennetback_xenbus.c
diff -u src/sys/arch/xen/xen/xennetback_xenbus.c:1.67 src/sys/arch/xen/xen/xennetback_xenbus.c:1.68
--- src/sys/arch/xen/xen/xennetback_xenbus.c:1.67 Thu Aug 9 17:32:44 2018
+++ src/sys/arch/xen/xen/xennetback_xenbus.c Sat Aug 11 10:34:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xennetback_xenbus.c,v 1.67 2018/08/09 17:32:44 maxv Exp $ */
+/* $NetBSD: xennetback_xenbus.c,v 1.68 2018/08/11 10:34:25 jdolecek Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.67 2018/08/09 17:32:44 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.68 2018/08/11 10:34:25 jdolecek Exp $");
#include "opt_xen.h"
@@ -383,8 +383,7 @@ xennetback_xenbus_destroy(void *arg)
aprint_verbose_ifnet(&xneti->xni_if, "disconnecting\n");
- if (xneti->xni_status == CONNECTED) {
- KASSERT(xneti->xni_ih);
+ if (xneti->xni_ih != NULL) {
hypervisor_mask_event(xneti->xni_evtchn);
intr_disestablish(xneti->xni_ih);
xneti->xni_ih = NULL;
