diff options
author | Neil Horman <nhorman@tuxdriver.com> | 2008-12-22 23:43:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-22 23:43:12 -0500 |
commit | 908a7a16b852ffd618a9127be8d62432182d81b4 (patch) | |
tree | a0b509227e26bef7edd347575761e0dbeb5756e7 /drivers/net/r8169.c | |
parent | 889bd9b6dbcd426b8698c4a779dd7dbf247f57b8 (diff) |
net: Remove unused netdev arg from some NAPI interfaces.
When the napi api was changed to separate its 1:1 binding to the net_device
struct, the netif_rx_[prep|schedule|complete] api failed to remove the now
vestigual net_device structure parameter. This patch cleans up that api by
properly removing it..
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/r8169.c')
-rw-r--r-- | drivers/net/r8169.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index dddf6aeff498..2c73ca606b35 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) | |||
3581 | RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event); | 3581 | RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event); |
3582 | tp->intr_mask = ~tp->napi_event; | 3582 | tp->intr_mask = ~tp->napi_event; |
3583 | 3583 | ||
3584 | if (likely(netif_rx_schedule_prep(dev, &tp->napi))) | 3584 | if (likely(netif_rx_schedule_prep(&tp->napi))) |
3585 | __netif_rx_schedule(dev, &tp->napi); | 3585 | __netif_rx_schedule(&tp->napi); |
3586 | else if (netif_msg_intr(tp)) { | 3586 | else if (netif_msg_intr(tp)) { |
3587 | printk(KERN_INFO "%s: interrupt %04x in poll\n", | 3587 | printk(KERN_INFO "%s: interrupt %04x in poll\n", |
3588 | dev->name, status); | 3588 | dev->name, status); |
@@ -3603,7 +3603,7 @@ static int rtl8169_poll(struct napi_struct *napi, int budget) | |||
3603 | rtl8169_tx_interrupt(dev, tp, ioaddr); | 3603 | rtl8169_tx_interrupt(dev, tp, ioaddr); |
3604 | 3604 | ||
3605 | if (work_done < budget) { | 3605 | if (work_done < budget) { |
3606 | netif_rx_complete(dev, napi); | 3606 | netif_rx_complete(napi); |
3607 | tp->intr_mask = 0xffff; | 3607 | tp->intr_mask = 0xffff; |
3608 | /* | 3608 | /* |
3609 | * 20040426: the barrier is not strictly required but the | 3609 | * 20040426: the barrier is not strictly required but the |