aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/macb.c
diff options
context:
space:
mode:
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 f6c4936e2fa8..dc33d51213d7 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -527,7 +527,7 @@ static int macb_poll(struct napi_struct *napi, int budget)
527 * this function was called last time, and no packets 527 * this function was called last time, and no packets
528 * have been received since. 528 * have been received since.
529 */ 529 */
530 netif_rx_complete(napi); 530 napi_complete(napi);
531 goto out; 531 goto out;
532 } 532 }
533 533
@@ -538,13 +538,13 @@ static int macb_poll(struct napi_struct *napi, int budget)
538 dev_warn(&bp->pdev->dev, 538 dev_warn(&bp->pdev->dev,
539 "No RX buffers complete, status = %02lx\n", 539 "No RX buffers complete, status = %02lx\n",
540 (unsigned long)status); 540 (unsigned long)status);
541 netif_rx_complete(napi); 541 napi_complete(napi);
542 goto out; 542 goto out;
543 } 543 }
544 544
545 work_done = macb_rx(bp, budget); 545 work_done = macb_rx(bp, budget);
546 if (work_done < budget) 546 if (work_done < budget)
547 netif_rx_complete(napi); 547 napi_complete(napi);
548 548
549 /* 549 /*
550 * We've done what we can to clean the buffers. Make sure we 550 * We've done what we can to clean the buffers. Make sure we
@@ -579,7 +579,7 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
579 } 579 }
580 580
581 if (status & MACB_RX_INT_FLAGS) { 581 if (status & MACB_RX_INT_FLAGS) {
582 if (netif_rx_schedule_prep(&bp->napi)) { 582 if (napi_schedule_prep(&bp->napi)) {
583 /* 583 /*
584 * There's no point taking any more interrupts 584 * There's no point taking any more interrupts
585 * until we have processed the buffers 585 * until we have processed the buffers
@@ -587,7 +587,7 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
587 macb_writel(bp, IDR, MACB_RX_INT_FLAGS); 587 macb_writel(bp, IDR, MACB_RX_INT_FLAGS);
588 dev_dbg(&bp->pdev->dev, 588 dev_dbg(&bp->pdev->dev,
589 "scheduling RX softirq\n"); 589 "scheduling RX softirq\n");
590 __netif_rx_schedule(&bp->napi); 590 __napi_schedule(&bp->napi);
591 } 591 }
592 } 592 }
593 593