[PATCH] sky2: change netif_rx_schedule_test to __netif_schedule_prep

I didn't like the name netif_rx_schedule_test(), in earlier patches
and changed to __netif_rx_schedule_prep to be more consistent.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 2253140ff4dc..f56de9894208 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1961,10 +1961,11 @@ static irqreturn_t sky2_intr(int irq, void *dev_id, struct pt_regs *regs)
         if (status & Y2_IS_STAT_BMU) {
                 hw->intr_mask &= ~Y2_IS_STAT_BMU;
                 sky2_write32(hw, B0_IMSK, hw->intr_mask);
-                prefetch(&hw->st_le[hw->st_idx]);
 
-                if (netif_rx_schedule_test(dev0))
+                if (likely(__netif_rx_schedule_prep(dev0))) {
+                        prefetch(&hw->st_le[hw->st_idx]);
                         __netif_rx_schedule(dev0);
+                }
         }
 
         if (status & Y2_IS_IRQ_PHY1)