[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <48FC7164.8040002@myri.com>
Date: Mon, 20 Oct 2008 13:54:12 +0200
From: Brice Goglin <brice@...i.com>
To: Jeff Garzik <jgarzik@...hat.com>
CC: netdev@...r.kernel.org
Subject: [PATCH] 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@...i.com>
--- linux-2.6/drivers/net/myri10ge/myri10ge.c 2008-10-20 08:36:48.000000000 +0200
+++ linux-tmp/drivers/net/myri10ge/myri10ge.c 2008-10-20 13:47:21.000000000 +0200
@@ -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@...i.com");
@@ -2497,6 +2497,10 @@ static int myri10ge_open(struct net_devi
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]);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists