diff options
| author |   Stephen Hemminger <shemminger@vyatta.com> | 2009-08-14 05:15:16 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-08-14 15:30:03 -0700 |
| commit | 19720737187aaee006afb20e63be5e9eddc505a8 (patch) | |
| tree | 5ecc3d10f36c9ad2b4d4f04bf916797c42e34872 /drivers/net/sky2.c | |
| parent | sky2: hold spinlock around phy_power_down (diff) | |
| download | linux-dev-19720737187aaee006afb20e63be5e9eddc505a8.tar.xz linux-dev-19720737187aaee006afb20e63be5e9eddc505a8.zip | |
sky2: hold RTNL when doing suspend/shutdown operations
The suspend and shutdown code plays with shared state. Use consistent
locking, for extra protection.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 1d3ee03fa648..3ae4b42fe4d7 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -4643,6 +4643,7 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state) del_timer_sync(&hw->watchdog_timer); cancel_work_sync(&hw->restart_work); + rtnl_lock(); for (i = 0; i < hw->ports; i++) { struct net_device *dev = hw->dev[i]; struct sky2_port *sky2 = netdev_priv(dev); @@ -4660,6 +4661,7 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state) sky2_write32(hw, B0_IMSK, 0); napi_disable(&hw->napi); sky2_power_aux(hw); + rtnl_unlock(); pci_save_state(pdev); pci_enable_wake(pdev, pci_choose_state(pdev, state), wol); @@ -4729,6 +4731,7 @@ static void sky2_shutdown(struct pci_dev *pdev) if (!hw) return; + rtnl_lock(); del_timer_sync(&hw->watchdog_timer); for (i = 0; i < hw->ports; i++) { @@ -4743,6 +4746,7 @@ static void sky2_shutdown(struct pci_dev *pdev) if (wol) sky2_power_aux(hw); + rtnl_unlock(); pci_enable_wake(pdev, PCI_D3hot, wol); pci_enable_wake(pdev, PCI_D3cold, wol); |