Skip to content

L
linux
Commit 3a6fdfa4 authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Jeff Garzik
Browse files
Options

Update eepro100 net driver to enable/disable its software timer 

at suspend/resume time.
parent 39a70d79
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
drivers/net/eepro100.c
View file @ 3a6fdfa4
...@@ -2206,6 +2206,8 @@ static int eepro100_suspend(struct pci_dev *pdev, u32 state) ...@@ -2206,6 +2206,8 @@ static int eepro100_suspend(struct pci_dev *pdev, u32 state)
if (!netif_running(dev)) if (!netif_running(dev))
return 0; return 0;
del_timer_sync(&sp->timer);
netif_device_detach(dev); netif_device_detach(dev);
outl(PortPartialReset, ioaddr + SCBPort); outl(PortPartialReset, ioaddr + SCBPort);
...@@ -2237,6 +2239,8 @@ static int eepro100_resume(struct pci_dev *pdev) ...@@ -2237,6 +2239,8 @@ static int eepro100_resume(struct pci_dev *pdev)
sp->rx_mode = -1; sp->rx_mode = -1;
sp->flow_ctrl = sp->partner = 0; sp->flow_ctrl = sp->partner = 0;
set_rx_mode(dev); set_rx_mode(dev);
sp->timer.expires = RUN_AT(2*HZ);
add_timer(&sp->timer);
return 0; return 0;
} }
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7