rename check_busy acceleration callback to check_ready diff -r b3878575ba25 drivers/xen/netfront/accel.c --- a/drivers/xen/netfront/accel.c Tue Oct 30 13:25:17 2007 +0000 +++ b/drivers/xen/netfront/accel.c Tue Oct 30 13:26:21 2007 +0000 @@ -605,8 +605,8 @@ EXPORT_SYMBOL_GPL(netfront_accelerator_s -int netfront_check_accelerator_queue_busy(struct net_device *dev, - struct netfront_info *np) +int netfront_check_accelerator_queue_ready(struct net_device *dev, + struct netfront_info *np) { struct netfront_accelerator *accelerator; struct netfront_accel_hooks *hooks; @@ -616,7 +616,7 @@ int netfront_check_accelerator_queue_bus accelerator = np->accelerator; /* - * Call the check busy accelerator hook. The use count for the + * Call the check ready accelerator hook. The use count for the * accelerator's hooks is incremented for the duration of the * call to prevent the accelerator being able to modify the * hooks in the middle (by, for example, unloading) @@ -629,7 +629,7 @@ int netfront_check_accelerator_queue_bus spin_unlock_irqrestore (&accelerator->vif_states_lock, flags); - rc = np->accel_vif_state.hooks->check_busy(dev); + rc = np->accel_vif_state.hooks->check_ready(dev); kref_put(&np->accel_vif_state.vif_kref, vif_kref_release); diff -r b3878575ba25 drivers/xen/netfront/netfront.c --- a/drivers/xen/netfront/netfront.c Tue Oct 30 13:25:17 2007 +0000 +++ b/drivers/xen/netfront/netfront.c Tue Oct 30 13:25:17 2007 +0000 @@ -593,12 +593,12 @@ static inline void network_maybe_wake_tx if (unlikely(netif_queue_stopped(dev)) && netfront_tx_slot_available(np) && likely(netif_running(dev)) && - netfront_check_accelerator_queue_busy(dev, np)) + netfront_check_accelerator_queue_ready(dev, np)) netif_wake_queue(dev); } -int netfront_check_queue_busy(struct net_device *dev) +int netfront_check_queue_ready(struct net_device *dev) { struct netfront_info *np = netdev_priv(dev); @@ -606,7 +606,7 @@ int netfront_check_queue_busy(struct net netfront_tx_slot_available(np) && likely(netif_running(dev)); } -EXPORT_SYMBOL(netfront_check_queue_busy); +EXPORT_SYMBOL(netfront_check_queue_ready); static int network_open(struct net_device *dev) diff -r b3878575ba25 drivers/xen/netfront/netfront.h --- a/drivers/xen/netfront/netfront.h Tue Oct 30 13:25:17 2007 +0000 +++ b/drivers/xen/netfront/netfront.h Tue Oct 30 13:25:17 2007 +0000 @@ -85,7 +85,7 @@ struct netfront_accel_hooks { * Called before re-enabling the TX queue to check the fast * path has slots too */ - int (*check_busy)(struct net_device *dev); + int (*check_ready)(struct net_device *dev); /* * Get the fastpath network statistics */ @@ -254,7 +254,7 @@ extern void netfront_accelerator_stop(co * ensure the slow path has available slots. Returns true if OK to * wake, false if still busy */ -extern int netfront_check_queue_busy(struct net_device *net_dev); +extern int netfront_check_queue_ready(struct net_device *net_dev); @@ -266,8 +266,8 @@ extern int netfront_check_queue_busy(str * if still busy */ extern -int netfront_check_accelerator_queue_busy(struct net_device *dev, - struct netfront_info *np); +int netfront_check_accelerator_queue_ready(struct net_device *dev, + struct netfront_info *np); extern int netfront_accelerator_call_remove(struct netfront_info *np, struct xenbus_device *dev);