diff options
Diffstat (limited to 'drivers/net/arm/ep93xx_eth.c')
-rw-r--r-- | drivers/net/arm/ep93xx_eth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c index 3ec20cc18b0c..cc7708775da0 100644 --- a/drivers/net/arm/ep93xx_eth.c +++ b/drivers/net/arm/ep93xx_eth.c | |||
@@ -298,7 +298,7 @@ poll_some_more: | |||
298 | int more = 0; | 298 | int more = 0; |
299 | 299 | ||
300 | spin_lock_irq(&ep->rx_lock); | 300 | spin_lock_irq(&ep->rx_lock); |
301 | __netif_rx_complete(napi); | 301 | __napi_complete(napi); |
302 | wrl(ep, REG_INTEN, REG_INTEN_TX | REG_INTEN_RX); | 302 | wrl(ep, REG_INTEN, REG_INTEN_TX | REG_INTEN_RX); |
303 | if (ep93xx_have_more_rx(ep)) { | 303 | if (ep93xx_have_more_rx(ep)) { |
304 | wrl(ep, REG_INTEN, REG_INTEN_TX); | 304 | wrl(ep, REG_INTEN, REG_INTEN_TX); |
@@ -307,7 +307,7 @@ poll_some_more: | |||
307 | } | 307 | } |
308 | spin_unlock_irq(&ep->rx_lock); | 308 | spin_unlock_irq(&ep->rx_lock); |
309 | 309 | ||
310 | if (more && netif_rx_reschedule(napi)) | 310 | if (more && napi_reschedule(napi)) |
311 | goto poll_some_more; | 311 | goto poll_some_more; |
312 | } | 312 | } |
313 | 313 | ||
@@ -415,9 +415,9 @@ static irqreturn_t ep93xx_irq(int irq, void *dev_id) | |||
415 | 415 | ||
416 | if (status & REG_INTSTS_RX) { | 416 | if (status & REG_INTSTS_RX) { |
417 | spin_lock(&ep->rx_lock); | 417 | spin_lock(&ep->rx_lock); |
418 | if (likely(netif_rx_schedule_prep(&ep->napi))) { | 418 | if (likely(napi_schedule_prep(&ep->napi))) { |
419 | wrl(ep, REG_INTEN, REG_INTEN_TX); | 419 | wrl(ep, REG_INTEN, REG_INTEN_TX); |
420 | __netif_rx_schedule(&ep->napi); | 420 | __napi_schedule(&ep->napi); |
421 | } | 421 | } |
422 | spin_unlock(&ep->rx_lock); | 422 | spin_unlock(&ep->rx_lock); |
423 | } | 423 | } |