Commit 97bdefff authored by David S. Miller's avatar David S. Miller

[TG3]: Disable/enable timer in suspend/resume.

parent c53b942b
...@@ -7776,6 +7776,8 @@ static int tg3_suspend(struct pci_dev *pdev, u32 state) ...@@ -7776,6 +7776,8 @@ static int tg3_suspend(struct pci_dev *pdev, u32 state)
tg3_netif_stop(tp); tg3_netif_stop(tp);
del_timer_sync(&tp->timer);
spin_lock_irq(&tp->lock); spin_lock_irq(&tp->lock);
spin_lock(&tp->tx_lock); spin_lock(&tp->tx_lock);
tg3_disable_ints(tp); tg3_disable_ints(tp);
...@@ -7797,6 +7799,9 @@ static int tg3_suspend(struct pci_dev *pdev, u32 state) ...@@ -7797,6 +7799,9 @@ static int tg3_suspend(struct pci_dev *pdev, u32 state)
tg3_init_hw(tp); tg3_init_hw(tp);
tp->timer.expires = jiffies + tp->timer_offset;
add_timer(&tp->timer);
spin_unlock(&tp->tx_lock); spin_unlock(&tp->tx_lock);
spin_unlock_irq(&tp->lock); spin_unlock_irq(&tp->lock);
...@@ -7826,6 +7831,10 @@ static int tg3_resume(struct pci_dev *pdev) ...@@ -7826,6 +7831,10 @@ static int tg3_resume(struct pci_dev *pdev)
spin_lock(&tp->tx_lock); spin_lock(&tp->tx_lock);
tg3_init_hw(tp); tg3_init_hw(tp);
tp->timer.expires = jiffies + tp->timer_offset;
add_timer(&tp->timer);
tg3_enable_ints(tp); tg3_enable_ints(tp);
spin_unlock(&tp->tx_lock); spin_unlock(&tp->tx_lock);
......
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