aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/smsc911x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/smsc911x.c')
-rw-r--r--drivers/net/smsc911x.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index f513bdf1c887..d271ae39c6f3 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -984,7 +984,7 @@ static int smsc911x_poll(struct napi_struct *napi, int budget)
984 /* We processed all packets available. Tell NAPI it can 984 /* We processed all packets available. Tell NAPI it can
985 * stop polling then re-enable rx interrupts */ 985 * stop polling then re-enable rx interrupts */
986 smsc911x_reg_write(pdata, INT_STS, INT_STS_RSFL_); 986 smsc911x_reg_write(pdata, INT_STS, INT_STS_RSFL_);
987 netif_rx_complete(napi); 987 napi_complete(napi);
988 temp = smsc911x_reg_read(pdata, INT_EN); 988 temp = smsc911x_reg_read(pdata, INT_EN);
989 temp |= INT_EN_RSFL_EN_; 989 temp |= INT_EN_RSFL_EN_;
990 smsc911x_reg_write(pdata, INT_EN, temp); 990 smsc911x_reg_write(pdata, INT_EN, temp);
@@ -1485,16 +1485,16 @@ static irqreturn_t smsc911x_irqhandler(int irq, void *dev_id)
1485 } 1485 }
1486 1486
1487 if (likely(intsts & inten & INT_STS_RSFL_)) { 1487 if (likely(intsts & inten & INT_STS_RSFL_)) {
1488 if (likely(netif_rx_schedule_prep(&pdata->napi))) { 1488 if (likely(napi_schedule_prep(&pdata->napi))) {
1489 /* Disable Rx interrupts */ 1489 /* Disable Rx interrupts */
1490 temp = smsc911x_reg_read(pdata, INT_EN); 1490 temp = smsc911x_reg_read(pdata, INT_EN);
1491 temp &= (~INT_EN_RSFL_EN_); 1491 temp &= (~INT_EN_RSFL_EN_);
1492 smsc911x_reg_write(pdata, INT_EN, temp); 1492 smsc911x_reg_write(pdata, INT_EN, temp);
1493 /* Schedule a NAPI poll */ 1493 /* Schedule a NAPI poll */
1494 __netif_rx_schedule(&pdata->napi); 1494 __napi_schedule(&pdata->napi);
1495 } else { 1495 } else {
1496 SMSC_WARNING(RX_ERR, 1496 SMSC_WARNING(RX_ERR,
1497 "netif_rx_schedule_prep failed"); 1497 "napi_schedule_prep failed");
1498 } 1498 }
1499 serviced = IRQ_HANDLED; 1499 serviced = IRQ_HANDLED;
1500 } 1500 }