[PATCH net-drivers-2.6 2/10] e1000: use netif_poll_{enable|disable}

[Malli Chilakala <mallikarjuna.chilakala@xxxxxxxxx>]

2 use netif_poll_{enable|disable} to synchronize between poll and i/f down/up
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@xxxxxxxxx>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@xxxxxxxxx>
Signed-off-by: John Ronciak <john.ronciak@xxxxxxxxx>
diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c 
net-drivers-2.6/drivers/net/e1000.new/e1000_main.c
--- net-drivers-2.6/drivers/net/e1000/e1000_main.c      2005-02-01 
23:10:24.989105880 -0800
+++ net-drivers-2.6/drivers/net/e1000.new/e1000_main.c  2005-02-01 
23:10:26.709844288 -0800
@@ -308,6 +308,9 @@ e1000_up(struct e1000_adapter *adapter)
        mod_timer(&adapter->watchdog_timer, jiffies);
        e1000_irq_enable(adapter);
 
+#ifdef CONFIG_E1000_NAPI
+       netif_poll_enable(netdev);
+#endif
        return 0;
 }
 
@@ -321,6 +324,10 @@ e1000_down(struct e1000_adapter *adapter
        del_timer_sync(&adapter->tx_fifo_stall_timer);
        del_timer_sync(&adapter->watchdog_timer);
        del_timer_sync(&adapter->phy_info_timer);
+
+#ifdef CONFIG_E1000_NAPI
+       netif_poll_disable(netdev);
+#endif
        adapter->link_speed = 0;
        adapter->link_duplex = 0;
        netif_carrier_off(netdev);