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/pcnet32.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/pcnet32.c')
-rw-r--r-- | drivers/net/pcnet32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index f2b192c80e17..044b7b07f5f4 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
@@ -1397,7 +1397,7 @@ static int pcnet32_poll(struct napi_struct *napi, int budget) | |||
1397 | if (work_done < budget) { | 1397 | if (work_done < budget) { |
1398 | spin_lock_irqsave(&lp->lock, flags); | 1398 | spin_lock_irqsave(&lp->lock, flags); |
1399 | 1399 | ||
1400 | __netif_rx_complete(dev, napi); | 1400 | __netif_rx_complete(napi); |
1401 | 1401 | ||
1402 | /* clear interrupt masks */ | 1402 | /* clear interrupt masks */ |
1403 | val = lp->a.read_csr(ioaddr, CSR3); | 1403 | val = lp->a.read_csr(ioaddr, CSR3); |
@@ -2586,14 +2586,14 @@ pcnet32_interrupt(int irq, void *dev_id) | |||
2586 | dev->name, csr0); | 2586 | dev->name, csr0); |
2587 | /* unlike for the lance, there is no restart needed */ | 2587 | /* unlike for the lance, there is no restart needed */ |
2588 | } | 2588 | } |
2589 | if (netif_rx_schedule_prep(dev, &lp->napi)) { | 2589 | if (netif_rx_schedule_prep(&lp->napi)) { |
2590 | u16 val; | 2590 | u16 val; |
2591 | /* set interrupt masks */ | 2591 | /* set interrupt masks */ |
2592 | val = lp->a.read_csr(ioaddr, CSR3); | 2592 | val = lp->a.read_csr(ioaddr, CSR3); |
2593 | val |= 0x5f00; | 2593 | val |= 0x5f00; |
2594 | lp->a.write_csr(ioaddr, CSR3, val); | 2594 | lp->a.write_csr(ioaddr, CSR3, val); |
2595 | mmiowb(); | 2595 | mmiowb(); |
2596 | __netif_rx_schedule(dev, &lp->napi); | 2596 | __netif_rx_schedule(&lp->napi); |
2597 | break; | 2597 | break; |
2598 | } | 2598 | } |
2599 | csr0 = lp->a.read_csr(ioaddr, CSR0); | 2599 | csr0 = lp->a.read_csr(ioaddr, CSR0); |