diff --git a/[refs] b/[refs] index 98954c241e9e..b65c1c32dc2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 636d2f68a0814d84de26c021b2c15e3b4ffa29de +refs/heads/master: cbea270714faae389c48c2901ee7988ecd62f664 diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c index 65f55877be95..b2c49679bba7 100644 --- a/trunk/drivers/net/gianfar.c +++ b/trunk/drivers/net/gianfar.c @@ -1583,8 +1583,10 @@ static void gfar_reset_task(struct work_struct *work) struct net_device *dev = priv->ndev; if (dev->flags & IFF_UP) { + netif_stop_queue(dev); stop_gfar(dev); startup_gfar(dev); + netif_start_queue(dev); } netif_tx_schedule_all(dev);