aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBrice Goglin <brice@myri.com>2008-10-20 13:54:12 +0200
committerJeff Garzik <jgarzik@redhat.com>2008-10-22 06:22:11 -0400
commit051d36f3fbd013a73cb42a6762e5bf339a3732aa (patch)
treeb41728862789049361cb4f9e9004b60d2fee18ea /drivers/net
parentcde0d910b9185519f7f2cfe015f9039e02c2f25b (diff)
downloadkernel_samsung_smdk4412-051d36f3fbd013a73cb42a6762e5bf339a3732aa.zip
kernel_samsung_smdk4412-051d36f3fbd013a73cb42a6762e5bf339a3732aa.tar.gz
kernel_samsung_smdk4412-051d36f3fbd013a73cb42a6762e5bf339a3732aa.tar.bz2
myri10ge: disable NAPI on failure to setup the interface
Disable NAPI if a failure occurs when setting up the interface. Leaving it enabled could cause a BUG the next time an ifconfig up is issued. Signed-off-by: Brice Goglin <brice@myri.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/myri10ge/myri10ge.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index a9aebad..b1556b2 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -75,7 +75,7 @@
#include "myri10ge_mcp.h"
#include "myri10ge_mcp_gen_header.h"
-#define MYRI10GE_VERSION_STR "1.4.3-1.369"
+#define MYRI10GE_VERSION_STR "1.4.3-1.371"
MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
MODULE_AUTHOR("Maintainer: help@myri.com");
@@ -2497,6 +2497,10 @@ static int myri10ge_open(struct net_device *dev)
return 0;
abort_with_rings:
+ while (slice) {
+ slice--;
+ napi_disable(&mgp->ss[slice].napi);
+ }
for (i = 0; i < mgp->num_slices; i++)
myri10ge_free_rings(&mgp->ss[i]);