From: Phil Sutter Date: Thu, 15 Jan 2009 05:48:24 +0000 (-0800) Subject: korina: disable napi on close and restart X-Git-Tag: v2.6.29-rc2~11^2~7 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=beb0babfb77eab0cbcc7f64a7b8f3545fec5c0ba;p=linux-2.6-omap-h63xx.git korina: disable napi on close and restart Without this the driver will crash when the NIC is being restarted. Signed-off-by: Phil Sutter Acked-by: Florian Fainelli Signed-off-by: David S. Miller --- diff --git a/drivers/net/korina.c b/drivers/net/korina.c index e30c2f437d1..65b8487c189 100644 --- a/drivers/net/korina.c +++ b/drivers/net/korina.c @@ -904,6 +904,8 @@ static int korina_restart(struct net_device *dev) korina_free_ring(dev); + napi_disable(&lp->napi); + ret = korina_init(dev); if (ret < 0) { printk(KERN_ERR DRV_NAME "%s: cannot restart device\n", @@ -1070,6 +1072,8 @@ static int korina_close(struct net_device *dev) korina_free_ring(dev); + napi_disable(&lp->napi); + free_irq(lp->rx_irq, dev); free_irq(lp->tx_irq, dev); free_irq(lp->ovr_irq, dev);