From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: [PATCH 7/8] sky2: hold RTNL when doing suspend/shutdown operations Date: Thu, 06 Aug 2009 09:12:20 -0700 Message-ID: <20090806161232.998780534@vyatta.com> References: <20090806161213.148382653@vyatta.com> Cc: netdev@vger.kernel.org To: David Miller Return-path: Received: from suva.vyatta.com ([76.74.103.44]:38262 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755896AbZHFQom (ORCPT ); Thu, 6 Aug 2009 12:44:42 -0400 Content-Disposition: inline; filename=sky2-wol-rtnl.patch Sender: netdev-owner@vger.kernel.org List-ID: The suspend and shutdown code plays with shared state. Use consistent locking, for extra protection. Signed-off-by: Stephen Hemminger --- a/drivers/net/sky2.c 2009-08-06 08:29:58.560356154 -0700 +++ b/drivers/net/sky2.c 2009-08-06 08:32:06.128478111 -0700 @@ -4635,6 +4635,7 @@ static int sky2_suspend(struct pci_dev * 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); @@ -4652,6 +4653,7 @@ static int sky2_suspend(struct pci_dev * 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); @@ -4721,6 +4723,7 @@ static void sky2_shutdown(struct pci_dev if (!hw) return; + rtnl_lock(); del_timer_sync(&hw->watchdog_timer); for (i = 0; i < hw->ports; i++) { @@ -4735,6 +4738,7 @@ static void sky2_shutdown(struct pci_dev if (wol) sky2_power_aux(hw); + rtnl_unlock(); pci_enable_wake(pdev, PCI_D3hot, wol); pci_enable_wake(pdev, PCI_D3cold, wol); --