ia64/linux-2.6.18-xen.hg

changeset 630:44e3ace9a1f1

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>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Jul 31 09:46:58 2008 +0100 (2008-07-31)
parents 1d647ef26f3f
children 2866e6af503e
files drivers/xen/netfront/accel.c
line diff
     1.1 --- a/drivers/xen/netfront/accel.c	Tue Jul 29 16:16:31 2008 +0100
     1.2 +++ b/drivers/xen/netfront/accel.c	Thu Jul 31 09:46:58 2008 +0100
     1.3 @@ -709,8 +709,9 @@ int netfront_accelerator_suspend_cancel(
     1.4  	 * accelerator, so no need to call accelerator_probe_new_vif()
     1.5  	 * directly here
     1.6  	 */
     1.7 -	netfront_accelerator_add_watch(np);
     1.8 - 	return 0;
     1.9 +	if (dev->state == XenbusStateConnected)
    1.10 +		netfront_accelerator_add_watch(np);
    1.11 +	return 0;
    1.12  }
    1.13   
    1.14