[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 03e3ec74f3fbaf821f2a28b0aa7bc6391bbcc571..9927106b76c7bd8714762389c4ed1c67843b302f 100644 (file)
--- 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;
 }