diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2010-11-16 19:26:52 -0800 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2010-11-16 19:26:52 -0800 |
| commit | 5f5ae6fc86083526088e2c2ca4454e0f44f1e0cb (patch) | |
| tree | 5bd61adbe1dd33c9dcf1932840958f65893a47ed /drivers/net/ixgbe/ixgbe_main.c | |
| parent | fc77dc3cc15144bbaf18203e9ef7a3e1beedfc3f (diff) | |
| download | linux-5f5ae6fc86083526088e2c2ca4454e0f44f1e0cb.tar.gz linux-5f5ae6fc86083526088e2c2ca4454e0f44f1e0cb.tar.bz2 linux-5f5ae6fc86083526088e2c2ca4454e0f44f1e0cb.zip | |
ixgbe: move ixgbe_clear_interrupt_scheme to before pci_save_state
The main reason for this change is to keep the suspend/resume logic matched
up. The clear_interrupt_scheme function will disable MSI-X which will
effect the PCIe configuration space. Therefore we will want to do it before
we save state to avoid having the interrupt state restored by
pci_restore_state, and then trying to re-enable MSI/MSI-X interrupts via
ixgbe_setup_interrupt_scheme.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 29523cec2704..cbb3570f920e 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -5327,6 +5327,8 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake) ixgbe_free_all_rx_resources(adapter); } + ixgbe_clear_interrupt_scheme(adapter); + #ifdef CONFIG_PM retval = pci_save_state(pdev); if (retval) @@ -5360,8 +5362,6 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake) *enable_wake = !!wufc; - ixgbe_clear_interrupt_scheme(adapter); - ixgbe_release_hw_control(adapter); pci_disable_device(pdev); |