summaryrefslogtreecommitdiffstats
path: root/target/linux/rb532/patches-2.6.27/009-korina_disable_napi_on_close_and_restart.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-01-25 13:36:27 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-01-25 13:36:27 +0000
commit3d2066526c138fd8f4a801c5d00037edf02df90e (patch)
treed4f7bf2ea046af01387c31a3901fed39c083cf5f /target/linux/rb532/patches-2.6.27/009-korina_disable_napi_on_close_and_restart.patch
parentc198a513980a3e837967934e305eb65fef196826 (diff)
downloadmaster-31e0f0ae-3d2066526c138fd8f4a801c5d00037edf02df90e.tar.gz
master-31e0f0ae-3d2066526c138fd8f4a801c5d00037edf02df90e.tar.bz2
master-31e0f0ae-3d2066526c138fd8f4a801c5d00037edf02df90e.zip
update 2.6.27 patches with upstream fixes from git repository and mailing-lists. via-rhine is still broken, thus not switching to 2.6.27 as default.
SVN-Revision: 14173
Diffstat (limited to 'target/linux/rb532/patches-2.6.27/009-korina_disable_napi_on_close_and_restart.patch')
-rw-r--r--target/linux/rb532/patches-2.6.27/009-korina_disable_napi_on_close_and_restart.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/rb532/patches-2.6.27/009-korina_disable_napi_on_close_and_restart.patch b/target/linux/rb532/patches-2.6.27/009-korina_disable_napi_on_close_and_restart.patch
new file mode 100644
index 0000000000..4eec6fd05d
--- /dev/null
+++ b/target/linux/rb532/patches-2.6.27/009-korina_disable_napi_on_close_and_restart.patch
@@ -0,0 +1,33 @@
+Without this the driver will crash when the NIC is being restarted.
+
+Signed-off-by: Phil Sutter <n0-1@freewrt.org>
+---
+ drivers/net/korina.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/korina.c b/drivers/net/korina.c
+index e30c2f4..65b8487 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);
+--
+1.5.6.4
+
+