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/via-rhine.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/via-rhine.c')
-rw-r--r-- | drivers/net/via-rhine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index 8d405c83df8b..ac07cc6e3cb2 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c | |||
@@ -589,7 +589,7 @@ static int rhine_napipoll(struct napi_struct *napi, int budget) | |||
589 | work_done = rhine_rx(dev, budget); | 589 | work_done = rhine_rx(dev, budget); |
590 | 590 | ||
591 | if (work_done < budget) { | 591 | if (work_done < budget) { |
592 | netif_rx_complete(dev, napi); | 592 | netif_rx_complete(napi); |
593 | 593 | ||
594 | iowrite16(IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow | | 594 | iowrite16(IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow | |
595 | IntrRxDropped | IntrRxNoBuf | IntrTxAborted | | 595 | IntrRxDropped | IntrRxNoBuf | IntrTxAborted | |
@@ -1318,7 +1318,7 @@ static irqreturn_t rhine_interrupt(int irq, void *dev_instance) | |||
1318 | IntrPCIErr | IntrStatsMax | IntrLinkChange, | 1318 | IntrPCIErr | IntrStatsMax | IntrLinkChange, |
1319 | ioaddr + IntrEnable); | 1319 | ioaddr + IntrEnable); |
1320 | 1320 | ||
1321 | netif_rx_schedule(dev, &rp->napi); | 1321 | netif_rx_schedule(&rp->napi); |
1322 | } | 1322 | } |
1323 | 1323 | ||
1324 | if (intr_status & (IntrTxErrSummary | IntrTxDone)) { | 1324 | if (intr_status & (IntrTxErrSummary | IntrTxDone)) { |