From f8be0cbdbfd1268d0a9da57bbdbd54f7f59ef0ec Mon Sep 17 00:00:00 2001
From: Malli Chilakala <mallikarjuna.chilakala@intel.com>
Date: Thu, 28 Apr 2005 19:39:30 -0700
Subject: [PATCH] --- yaml --- r: 1361 b: refs/heads/master c:
 5de556249fde97493a4c79dbf8979ace0f76789f h: refs/heads/master i:   1359:
 dab2ce79818e630897d7a20af7ad7a9ed6a26be4 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/e1000/e1000_main.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f85e6b3f1328..53aa76fb1b83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa4f7ef3aaa6cee6b04ebe90266ee893e0b2ce07
+refs/heads/master: 5de556249fde97493a4c79dbf8979ace0f76789f
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index 03e3ec74f3fb..9927106b76c7 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/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;
 }