[Xen-changelog] [linux-2.6.18-xen] net accel: Don't set accel watch on suspend_cancel unless we're in a

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1217494018 -3600
# Node ID 44e3ace9a1f154941f7ccfb97cb75a8ab01ac3d1
# Parent  1d647ef26f3ff578568ad1822bd666a46da9fed5
net accel: Don't set accel watch on suspend_cancel unless we're in a
state where it has meaning.

From: Kieran Mansley <kmansley@xxxxxxxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 drivers/xen/netfront/accel.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff -r 1d647ef26f3f -r 44e3ace9a1f1 drivers/xen/netfront/accel.c
--- a/drivers/xen/netfront/accel.c      Tue Jul 29 16:16:31 2008 +0100
+++ b/drivers/xen/netfront/accel.c      Thu Jul 31 09:46:58 2008 +0100
@@ -709,8 +709,9 @@ int netfront_accelerator_suspend_cancel(
         * 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;
 }
  
  

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog