From: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date: Fri, 29 Apr 2005 02:39:30 +0000 (-0700)
Subject: [PATCH] e1000: Enable polling before enabling interrupts
X-Git-Tag: v2.6.12-rc6~160^2~3^2~12
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5de556249fde97493a4c79dbf8979ace0f76789f;p=linux-2.6

[PATCH] e1000: Enable polling before enabling interrupts

Enable polling before enabling interrupts -- avoids (in NAPI mode) entering the ISR and returning without doing any work because polling is not enabled. [romieu@fr.zoriel.com]

Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c
---

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 03e3ec74f3..9927106b76 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -328,11 +328,12 @@ e1000_up(struct e1000_adapter *adapter)
 		return err;
 
 	mod_timer(&adapter->watchdog_timer, jiffies);
-	e1000_irq_enable(adapter);
 
 #ifdef CONFIG_E1000_NAPI
 	netif_poll_enable(netdev);
 #endif
+	e1000_irq_enable(adapter);
+
 	return 0;
 }