[src/netbsd-8]: src/sys/arch/xen/xen Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/1cc89dce8d38
branches:  netbsd-8
changeset: 435197:1cc89dce8d38
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Aug 15 12:04:02 2018 +0000

description:
Pull up following revision(s) (requested by dolecek in ticket #973):

        sys/arch/xen/xen/xennetback_xenbus.c: revision 1.68 (patch)

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 |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 6adf148159ba -r 1cc89dce8d38 sys/arch/xen/xen/xennetback_xenbus.c
--- a/sys/arch/xen/xen/xennetback_xenbus.c      Mon Aug 13 12:06:17 2018 +0000
+++ b/sys/arch/xen/xen/xennetback_xenbus.c      Wed Aug 15 12:04:02 2018 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: xennetback_xenbus.c,v 1.58.8.2 2018/07/26 23:55:29 snj Exp $      */
+/*      $NetBSD: xennetback_xenbus.c,v 1.58.8.3 2018/08/15 12:04:02 martin Exp $      */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.58.8.2 2018/07/26 23:55:29 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.58.8.3 2018/08/15 12:04:02 martin Exp $");
 
 #include "opt_xen.h"
 
@@ -386,10 +386,12 @@
 
        aprint_verbose_ifnet(&xneti->xni_if, "disconnecting\n");
 
-       if (xneti->xni_status == CONNECTED) {
+       if (xneti->xni_evtchn != 0) {
                hypervisor_mask_event(xneti->xni_evtchn);
                event_remove_handler(xneti->xni_evtchn, xennetback_evthandler,
                    xneti);
+               xneti->xni_evtchn = 0;
+
                if (xneti->xni_softintr) {
                        softint_disestablish(xneti->xni_softintr);
                        xneti->xni_softintr = NULL;