aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/gianfar.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r--drivers/net/gianfar.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index ea530673236e..2e76699f8104 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -1627,9 +1627,9 @@ static void gfar_schedule_cleanup(struct net_device *dev)
1627 spin_lock_irqsave(&priv->txlock, flags); 1627 spin_lock_irqsave(&priv->txlock, flags);
1628 spin_lock(&priv->rxlock); 1628 spin_lock(&priv->rxlock);
1629 1629
1630 if (netif_rx_schedule_prep(&priv->napi)) { 1630 if (napi_schedule_prep(&priv->napi)) {
1631 gfar_write(&priv->regs->imask, IMASK_RTX_DISABLED); 1631 gfar_write(&priv->regs->imask, IMASK_RTX_DISABLED);
1632 __netif_rx_schedule(&priv->napi); 1632 __napi_schedule(&priv->napi);
1633 } 1633 }
1634 1634
1635 spin_unlock(&priv->rxlock); 1635 spin_unlock(&priv->rxlock);
@@ -1886,7 +1886,7 @@ static int gfar_poll(struct napi_struct *napi, int budget)
1886 return budget; 1886 return budget;
1887 1887
1888 if (rx_cleaned < budget) { 1888 if (rx_cleaned < budget) {
1889 netif_rx_complete(napi); 1889 napi_complete(napi);
1890 1890
1891 /* Clear the halt bit in RSTAT */ 1891 /* Clear the halt bit in RSTAT */
1892 gfar_write(&priv->regs->rstat, RSTAT_CLEAR_RHALT); 1892 gfar_write(&priv->regs->rstat, RSTAT_CLEAR_RHALT);