]> bbs.cooldavid.org Git - net-next-2.6.git/commit
ixgbe: move ixgbe_clear_interrupt_scheme to before pci_save_state
authorAlexander Duyck <alexander.h.duyck@intel.com>
Wed, 17 Nov 2010 03:26:52 +0000 (19:26 -0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 17 Nov 2010 03:26:52 +0000 (19:26 -0800)
commit5f5ae6fc86083526088e2c2ca4454e0f44f1e0cb
tree5bd61adbe1dd33c9dcf1932840958f65893a47ed
parentfc77dc3cc15144bbaf18203e9ef7a3e1beedfc3f
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>
drivers/net/ixgbe/ixgbe_main.c