[PATCH] e1000: 2 use netif_poll_{enable|disable}
Linux Kernel Mailing List <[email protected]> Thu, 24 Feb 2005 05:40:36 +0000
| Newsgroups | gmane.linux.kernel.commits.2-4 |
|---|---|
| Message-ID | <[email protected]> |
ChangeSet 1.1548.1.2, 2005/02/24 00:40:36-05:00, [email protected] [PATCH] e1000: 2 use netif_poll_{enable|disable} 2 use netif_poll_{enable|disable} to synchronize between poll and i/f down/up Signed-off-by: Mallikarjuna R Chilakala <[email protected]> Signed-off-by: Ganesh Venkatesan <[email protected]> Signed-off-by: John Ronciak <[email protected]> Signed-off-by: Jeff Garzik <[email protected]> e1000_main.c | 7 +++++++ 1 files changed, 7 insertions(+) diff -Nru a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c --- a/drivers/net/e1000/e1000_main.c 2005-03-04 12:02:45 -08:00 +++ b/drivers/net/e1000/e1000_main.c 2005-03-04 12:02:45 -08:00 @@ -303,6 +303,9 @@ mod_timer(&adapter->watchdog_timer, jiffies); e1000_irq_enable(adapter); +#ifdef CONFIG_E1000_NAPI + netif_poll_enable(netdev); +#endif return 0; } @@ -316,6 +319,10 @@ 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);