Subject: [PATCH 1/2] E1000: Fix ifdown hang in git-2.6.24

From: Krishna Kumar <[email-masked]>
Date: Thu, 23 Aug 2007 14:34:18 +0530

Doing napi_disable twice hangs "ifdown" of the device. e1000_down is the
common place to call napi_disable.

Signed-off-by: Krishna Kumar <[email-masked]>
---
 e1000_main.c |    4 ----
 1 files changed, 4 deletions(-)

diff -ruNp org/drivers/net/e1000/e1000_main.c new/drivers/net/e1000/e1000_main.c
--- org/drivers/net/e1000/e1000_main.c	2007-08-23 13:32:16.000000000 +0530
+++ new/drivers/net/e1000/e1000_main.c	2007-08-23 13:32:34.000000000 +0530
@@ -1477,10 +1477,6 @@ e1000_close(struct net_device *netdev)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 
-#ifdef CONFIG_E1000_NAPI
-	napi_disable(&adapter->napi);
-#endif
-
 	WARN_ON(test_bit(__E1000_RESETTING, &adapter->flags));
 	e1000_down(adapter);
 	e1000_power_down_phy(adapter);