Module Name: src
Committed By: snj
Date: Mon Sep 28 01:47:49 UTC 2009
Modified Files:
src/sys/arch/xen/xen [netbsd-5]: xennetback_xenbus.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1030):
sys/arch/xen/xen/xennetback_xenbus.c: revision 1.30
Don't disestablish a soft interrupt which has not been established.
To generate a diff of this commit:
cvs rdiff -u -r1.24.4.1 -r1.24.4.2 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.24.4.1 src/sys/arch/xen/xen/xennetback_xenbus.c:1.24.4.2
--- src/sys/arch/xen/xen/xennetback_xenbus.c:1.24.4.1 Mon Sep 28 01:46:48 2009
+++ src/sys/arch/xen/xen/xennetback_xenbus.c Mon Sep 28 01:47:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xennetback_xenbus.c,v 1.24.4.1 2009/09/28 01:46:48 snj Exp $ */
+/* $NetBSD: xennetback_xenbus.c,v 1.24.4.2 2009/09/28 01:47:49 snj Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -385,7 +385,10 @@
aprint_verbose_ifnet(&xneti->xni_if, "disconnecting\n");
hypervisor_mask_event(xneti->xni_evtchn);
event_remove_handler(xneti->xni_evtchn, xennetback_evthandler, xneti);
- softint_disestablish(xneti->xni_softintr);
+ if (xneti->xni_softintr) {
+ softint_disestablish(xneti->xni_softintr);
+ xneti->xni_softintr = NULL;
+ }
SLIST_REMOVE(&xnetback_instances,
xneti, xnetback_instance, next);
