[src/trunk]: src/sys/arch/xen/xen disestablish interrupt handler regardless o...

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

details:   https://anonhg.NetBSD.org/src/rev/136c6578b88e
branches:  trunk
changeset: 834374:136c6578b88e
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sat Aug 11 10:34:25 2018 +0000

description:
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

diffstat:

 sys/arch/xen/xen/xennetback_xenbus.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 938cb76dd900 -r 136c6578b88e sys/arch/xen/xen/xennetback_xenbus.c
--- a/sys/arch/xen/xen/xennetback_xenbus.c      Sat Aug 11 10:20:44 2018 +0000
+++ b/sys/arch/xen/xen/xennetback_xenbus.c      Sat Aug 11 10:34:25 2018 +0000
@@ -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 @@
 
        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;