forked from luck/tmp_suning_uos_patched
[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
This commit is contained in:
parent
fa4f7ef3aa
commit
5de556249f
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user