aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/macb.c
diff options
context:
space:
mode:
authorNeil Horman <nhorman@tuxdriver.com>2008-12-22 23:43:12 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-22 23:43:12 -0500
commit908a7a16b852ffd618a9127be8d62432182d81b4 (patch)
treea0b509227e26bef7edd347575761e0dbeb5756e7 /drivers/net/macb.c
parent889bd9b6dbcd426b8698c4a779dd7dbf247f57b8 (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/macb.c')
-rw-r--r--drivers/net/macb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 261b9507124b..a04da4ecaa88 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -519,7 +519,7 @@ static int macb_poll(struct napi_struct *napi, int budget)
519 * this function was called last time, and no packets 519 * this function was called last time, and no packets
520 * have been received since. 520 * have been received since.
521 */ 521 */
522 netif_rx_complete(dev, napi); 522 netif_rx_complete(napi);
523 goto out; 523 goto out;
524 } 524 }
525 525
@@ -530,13 +530,13 @@ static int macb_poll(struct napi_struct *napi, int budget)
530 dev_warn(&bp->pdev->dev, 530 dev_warn(&bp->pdev->dev,
531 "No RX buffers complete, status = %02lx\n", 531 "No RX buffers complete, status = %02lx\n",
532 (unsigned long)status); 532 (unsigned long)status);
533 netif_rx_complete(dev, napi); 533 netif_rx_complete(napi);
534 goto out; 534 goto out;
535 } 535 }
536 536
537 work_done = macb_rx(bp, budget); 537 work_done = macb_rx(bp, budget);
538 if (work_done < budget) 538 if (work_done < budget)
539 netif_rx_complete(dev, napi); 539 netif_rx_complete(napi);
540 540
541 /* 541 /*
542 * We've done what we can to clean the buffers. Make sure we 542 * We've done what we can to clean the buffers. Make sure we
@@ -571,7 +571,7 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
571 } 571 }
572 572
573 if (status & MACB_RX_INT_FLAGS) { 573 if (status & MACB_RX_INT_FLAGS) {
574 if (netif_rx_schedule_prep(dev, &bp->napi)) { 574 if (netif_rx_schedule_prep(&bp->napi)) {
575 /* 575 /*
576 * There's no point taking any more interrupts 576 * There's no point taking any more interrupts
577 * until we have processed the buffers 577 * until we have processed the buffers
@@ -579,7 +579,7 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
579 macb_writel(bp, IDR, MACB_RX_INT_FLAGS); 579 macb_writel(bp, IDR, MACB_RX_INT_FLAGS);
580 dev_dbg(&bp->pdev->dev, 580 dev_dbg(&bp->pdev->dev,
581 "scheduling RX softirq\n"); 581 "scheduling RX softirq\n");
582 __netif_rx_schedule(dev, &bp->napi); 582 __netif_rx_schedule(&bp->napi);
583 } 583 }
584 } 584 }
585 585