Module Name: src
Committed By: jym
Date: Mon Apr 25 17:01:54 UTC 2011
Modified Files:
src/sys/arch/xen/xen: if_xennet_xenbus.c
Log Message:
Check status before proceeding further. Avoids spurious watch calls.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/xen/xen/if_xennet_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/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.49 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.50
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.49 Mon Apr 25 00:00:50 2011
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Mon Apr 25 17:01:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.49 2011/04/25 00:00:50 jym Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.50 2011/04/25 17:01:54 jym Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.49 2011/04/25 00:00:50 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.50 2011/04/25 17:01:54 jym Exp $");
#include "opt_xen.h"
#include "opt_nfs_boot.h"
@@ -570,6 +570,8 @@
xenbus_switch_state(sc->sc_xbusd, NULL, XenbusStateClosed);
break;
case XenbusStateInitWait:
+ if (sc->sc_backend_status == BEST_CONNECTED)
+ break;
if (xennet_talk_to_backend(sc) == 0)
xenbus_switch_state(sc->sc_xbusd, NULL,
XenbusStateConnected);
