From: Phil Sutter <n0-1@freewrt.org>
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: https://www.infradead.org/git/?a=commitdiff_plain;h=beb0babfb77e;p=users%2Fdwmw2%2Flinux.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 <n0-1@freewrt.org>
Acked-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/korina.c b/drivers/net/korina.c
index e30c2f437d193..65b8487c1896c 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);