net: Remove redundant NAPI functions

[net-next-2.6.git] / drivers / net / arm / ep93xx_eth.c

diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c
index 3ec20cc18b0cb397524f5108cd257086b48f871e..cc7708775da0c91e4e86a713a13ed17b781a1cc6 100644 (file)
--- a/drivers/net/arm/ep93xx_eth.c
+++ b/drivers/net/arm/ep93xx_eth.c
@@ -298,7 +298,7 @@ poll_some_more:
                int more = 0;
 
                spin_lock_irq(&ep->rx_lock);
-               __netif_rx_complete(napi);
+               __napi_complete(napi);
                wrl(ep, REG_INTEN, REG_INTEN_TX | REG_INTEN_RX);
                if (ep93xx_have_more_rx(ep)) {
                        wrl(ep, REG_INTEN, REG_INTEN_TX);
@@ -307,7 +307,7 @@ poll_some_more:
                }
                spin_unlock_irq(&ep->rx_lock);
 
-               if (more && netif_rx_reschedule(napi))
+               if (more && napi_reschedule(napi))
                        goto poll_some_more;
        }
 
@@ -415,9 +415,9 @@ static irqreturn_t ep93xx_irq(int irq, void *dev_id)
 
        if (status & REG_INTSTS_RX) {
                spin_lock(&ep->rx_lock);
-               if (likely(netif_rx_schedule_prep(&ep->napi))) {
+               if (likely(napi_schedule_prep(&ep->napi))) {
                        wrl(ep, REG_INTEN, REG_INTEN_TX);
-                       __netif_rx_schedule(&ep->napi);
+                       __napi_schedule(&ep->napi);
                }
                spin_unlock(&ep->rx_lock);
        }