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/korina.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/korina.c')
-rw-r--r-- | drivers/net/korina.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/korina.c b/drivers/net/korina.c index 63626953f07e..4a5580c1126a 100644 --- a/drivers/net/korina.c +++ b/drivers/net/korina.c | |||
@@ -327,7 +327,7 @@ static irqreturn_t korina_rx_dma_interrupt(int irq, void *dev_id) | |||
327 | 327 | ||
328 | dmas = readl(&lp->rx_dma_regs->dmas); | 328 | dmas = readl(&lp->rx_dma_regs->dmas); |
329 | if (dmas & (DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR)) { | 329 | if (dmas & (DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR)) { |
330 | netif_rx_schedule_prep(dev, &lp->napi); | 330 | netif_rx_schedule_prep(&lp->napi); |
331 | 331 | ||
332 | dmasm = readl(&lp->rx_dma_regs->dmasm); | 332 | dmasm = readl(&lp->rx_dma_regs->dmasm); |
333 | writel(dmasm | (DMA_STAT_DONE | | 333 | writel(dmasm | (DMA_STAT_DONE | |
@@ -466,7 +466,7 @@ static int korina_poll(struct napi_struct *napi, int budget) | |||
466 | 466 | ||
467 | work_done = korina_rx(dev, budget); | 467 | work_done = korina_rx(dev, budget); |
468 | if (work_done < budget) { | 468 | if (work_done < budget) { |
469 | netif_rx_complete(dev, napi); | 469 | netif_rx_complete(napi); |
470 | 470 | ||
471 | writel(readl(&lp->rx_dma_regs->dmasm) & | 471 | writel(readl(&lp->rx_dma_regs->dmasm) & |
472 | ~(DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR), | 472 | ~(DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR), |