net: Remove redundant NAPI functions

Following the removal of the unused struct net_device * parameter from
the NAPI functions named *netif_rx_* in commit 908a7a1, they are
exactly equivalent to the corresponding *napi_* functions and are
therefore redundant.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 2c73ca606b35..1c4a980253fe 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -3581,8 +3581,8 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
                 RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event);
                 tp->intr_mask = ~tp->napi_event;
 
-                if (likely(netif_rx_schedule_prep(&tp->napi)))
-                        __netif_rx_schedule(&tp->napi);
+                if (likely(napi_schedule_prep(&tp->napi)))
+                        __napi_schedule(&tp->napi);
                 else if (netif_msg_intr(tp)) {
                         printk(KERN_INFO "%s: interrupt %04x in poll\n",
                                dev->name, status);
@@ -3603,7 +3603,7 @@ static int rtl8169_poll(struct napi_struct *napi, int budget)
         rtl8169_tx_interrupt(dev, tp, ioaddr);
 
         if (work_done < budget) {
-                netif_rx_complete(napi);
+                napi_complete(napi);
                 tp->intr_mask = 0xffff;
                 /*
                  * 20040426: the barrier is not strictly required but the