netfront accel: rename check_busy acceleration callback to check_ready

Signed-off-by <kmansley@solarflare.com>

diff --git a/drivers/xen/netfront/accel.c b/drivers/xen/netfront/accel.c
index 8e3bec3734d7a211663f54143cf9cf7a00cd8d61..f4d271447a90ac2666906607aec467e648e3d679 100644 (file)
--- a/drivers/xen/netfront/accel.c
+++ b/drivers/xen/netfront/accel.c
@@ -605,8 +605,8 @@ EXPORT_SYMBOL_GPL(netfront_accelerator_stop);
 
 
 
-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_busy(struct net_device *dev,
        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_busy(struct net_device *dev,
                        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 --git a/drivers/xen/netfront/netfront.c b/drivers/xen/netfront/netfront.c
index 5fbe225b6055b75d5df804d332bde1eb409ade35..c0c5e32fad74837e7ca99a3f0dddf75acd24c669 100644 (file)
--- a/drivers/xen/netfront/netfront.c
+++ b/drivers/xen/netfront/netfront.c
@@ -593,12 +593,12 @@ static inline void network_maybe_wake_tx(struct net_device *dev)
        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_device *dev)
                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 --git a/drivers/xen/netfront/netfront.h b/drivers/xen/netfront/netfront.h
index 7768d63cc6fe29262d505d6af46b060478732f99..34da635afdec41d41d312971e801dcd620a3f234 100644 (file)
--- a/drivers/xen/netfront/netfront.h
+++ b/drivers/xen/netfront/netfront.h
@@ -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(const char *frontend);
  * 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(struct net_device *net_dev);
  * 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);