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/r6040.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/r6040.c')
-rw-r--r-- | drivers/net/r6040.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index aff1cc627c05..53bbddfc8c95 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c | |||
@@ -667,7 +667,7 @@ static int r6040_poll(struct napi_struct *napi, int budget) | |||
667 | work_done = r6040_rx(dev, budget); | 667 | work_done = r6040_rx(dev, budget); |
668 | 668 | ||
669 | if (work_done < budget) { | 669 | if (work_done < budget) { |
670 | netif_rx_complete(dev, napi); | 670 | netif_rx_complete(napi); |
671 | /* Enable RX interrupt */ | 671 | /* Enable RX interrupt */ |
672 | iowrite16(ioread16(ioaddr + MIER) | RX_INTS, ioaddr + MIER); | 672 | iowrite16(ioread16(ioaddr + MIER) | RX_INTS, ioaddr + MIER); |
673 | } | 673 | } |
@@ -704,7 +704,7 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id) | |||
704 | 704 | ||
705 | /* Mask off RX interrupt */ | 705 | /* Mask off RX interrupt */ |
706 | misr &= ~RX_INTS; | 706 | misr &= ~RX_INTS; |
707 | netif_rx_schedule(dev, &lp->napi); | 707 | netif_rx_schedule(&lp->napi); |
708 | } | 708 | } |
709 | 709 | ||
710 | /* TX interrupt request */ | 710 | /* TX interrupt request */ |