net accel: Don't set accel watch on suspend_cancel unless we're in a

state where it has meaning.

From: Kieran Mansley <kmansley@solarflare.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/drivers/xen/netfront/accel.c b/drivers/xen/netfront/accel.c
index 8fbafefff9354f4b1c2b0a8be94632e6b1a91e0a..fda2da96aa6c82954b794c7b46831c95348428b9 100644 (file)
--- a/drivers/xen/netfront/accel.c
+++ b/drivers/xen/netfront/accel.c
@@ -709,8 +709,9 @@ int netfront_accelerator_suspend_cancel(struct netfront_info *np,
         * accelerator, so no need to call accelerator_probe_new_vif()
         * directly here
         */
-       netfront_accelerator_add_watch(np);
-       return 0;
+       if (dev->state == XenbusStateConnected)
+               netfront_accelerator_add_watch(np);
+       return 0;
 }