From aadf742c2f07316654bf0b4fbfb373755dc2a60b Mon Sep 17 00:00:00 2001 From: Brice Goglin Date: Mon, 20 Oct 2008 13:54:12 +0200 Subject: [PATCH] --- yaml --- r: 117777 b: refs/heads/master c: 051d36f3fbd013a73cb42a6762e5bf339a3732aa h: refs/heads/master i: 117775: 566fe096ae3f24a4f9ac06942b1f85de0e248286 v: v3 --- [refs] | 2 +- trunk/drivers/net/myri10ge/myri10ge.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2e9a4c9d2908..bb72fd88dd82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cde0d910b9185519f7f2cfe015f9039e02c2f25b +refs/heads/master: 051d36f3fbd013a73cb42a6762e5bf339a3732aa diff --git a/trunk/drivers/net/myri10ge/myri10ge.c b/trunk/drivers/net/myri10ge/myri10ge.c index a9aebad52652..b1556b2e404c 100644 --- a/trunk/drivers/net/myri10ge/myri10ge.c +++ b/trunk/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]);