aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/r8169.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/r8169.c')
-rw-r--r--drivers/net/r8169.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index b3473401c83a..7e4b586e306d 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -3711,8 +3711,8 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
3711 RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event); 3711 RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event);
3712 tp->intr_mask = ~tp->napi_event; 3712 tp->intr_mask = ~tp->napi_event;
3713 3713
3714 if (likely(netif_rx_schedule_prep(&tp->napi))) 3714 if (likely(napi_schedule_prep(&tp->napi)))
3715 __netif_rx_schedule(&tp->napi); 3715 __napi_schedule(&tp->napi);
3716 else if (netif_msg_intr(tp)) { 3716 else if (netif_msg_intr(tp)) {
3717 printk(KERN_INFO "%s: interrupt %04x in poll\n", 3717 printk(KERN_INFO "%s: interrupt %04x in poll\n",
3718 dev->name, status); 3718 dev->name, status);
@@ -3733,7 +3733,7 @@ static int rtl8169_poll(struct napi_struct *napi, int budget)
3733 rtl8169_tx_interrupt(dev, tp, ioaddr); 3733 rtl8169_tx_interrupt(dev, tp, ioaddr);
3734 3734
3735 if (work_done < budget) { 3735 if (work_done < budget) {
3736 netif_rx_complete(napi); 3736 napi_complete(napi);
3737 tp->intr_mask = 0xffff; 3737 tp->intr_mask = 0xffff;
3738 /* 3738 /*
3739 * 20040426: the barrier is not strictly required but the 3739 * 20040426: the barrier is not strictly required but the