From 745d407cc4efc6743bb1215dd88d3874ff7ce1b4 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 14 Jan 2009 21:48:24 -0800 Subject: [PATCH] --- yaml --- r: 129800 b: refs/heads/master c: beb0babfb77eab0cbcc7f64a7b8f3545fec5c0ba h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/korina.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 07734de81a7f..ee5241c9eae3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a13b27826a67bfc0ca444fb42885f2069b6898e2 +refs/heads/master: beb0babfb77eab0cbcc7f64a7b8f3545fec5c0ba diff --git a/trunk/drivers/net/korina.c b/trunk/drivers/net/korina.c index e30c2f437d19..65b8487c1896 100644 --- a/trunk/drivers/net/korina.c +++ b/trunk/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);