Commit 051d36f3 authored by Brice Goglin's avatar Brice Goglin Committed by Jeff Garzik
Browse files

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: default avatarBrice Goglin <brice@myri.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent cde0d910

drivers/net/myri10ge/myri10ge.c

+5 −1
Original line number Diff line number Diff line
@@ -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]);