Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 1361
b: refs/heads/master
c: 5de5562
h: refs/heads/master
i:
  1359: dab2ce7
v: v3
  • Loading branch information
Malli Chilakala authored and Jeff Garzik committed May 13, 2005
1 parent 25e9b67 commit f8be0cb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fa4f7ef3aaa6cee6b04ebe90266ee893e0b2ce07
refs/heads/master: 5de556249fde97493a4c79dbf8979ace0f76789f
3 changes: 2 additions & 1 deletion trunk/drivers/net/e1000/e1000_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit f8be0cb

Please sign in to comment.