diff options
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r-- | drivers/net/gianfar.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 3f7eab42aef1..f5e6068f9b07 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -1623,9 +1623,9 @@ static void gfar_schedule_cleanup(struct net_device *dev) | |||
1623 | spin_lock_irqsave(&priv->txlock, flags); | 1623 | spin_lock_irqsave(&priv->txlock, flags); |
1624 | spin_lock(&priv->rxlock); | 1624 | spin_lock(&priv->rxlock); |
1625 | 1625 | ||
1626 | if (netif_rx_schedule_prep(&priv->napi)) { | 1626 | if (napi_schedule_prep(&priv->napi)) { |
1627 | gfar_write(&priv->regs->imask, IMASK_RTX_DISABLED); | 1627 | gfar_write(&priv->regs->imask, IMASK_RTX_DISABLED); |
1628 | __netif_rx_schedule(&priv->napi); | 1628 | __napi_schedule(&priv->napi); |
1629 | } | 1629 | } |
1630 | 1630 | ||
1631 | spin_unlock(&priv->rxlock); | 1631 | spin_unlock(&priv->rxlock); |
@@ -1882,7 +1882,7 @@ static int gfar_poll(struct napi_struct *napi, int budget) | |||
1882 | return budget; | 1882 | return budget; |
1883 | 1883 | ||
1884 | if (rx_cleaned < budget) { | 1884 | if (rx_cleaned < budget) { |
1885 | netif_rx_complete(napi); | 1885 | napi_complete(napi); |
1886 | 1886 | ||
1887 | /* Clear the halt bit in RSTAT */ | 1887 | /* Clear the halt bit in RSTAT */ |
1888 | gfar_write(&priv->regs->rstat, RSTAT_CLEAR_RHALT); | 1888 | gfar_write(&priv->regs->rstat, RSTAT_CLEAR_RHALT); |