diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-25 09:31:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-25 09:31:07 +0200 |
| commit | cc93d7d77d28d65d4f947dabc95a01c42d713ea3 (patch) | |
| tree | bdaa01a54c7d881b7087551daf85fa52c61b3d1c /drivers/net/ixgbe/ixgbe_main.c | |
| parent | xfrm: alg_key_len & alg_icv_len should be unsigned (diff) | |
| parent | [netdrvr] tehuti: move ioctl perm check closer to function start (diff) | |
| download | linux-cc93d7d77d28d65d4f947dabc95a01c42d713ea3.tar.xz linux-cc93d7d77d28d65d4f947dabc95a01c42d713ea3.zip | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index cb371a8c24a7..7b859220c255 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -3431,6 +3431,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, } pci_set_master(pdev); + pci_save_state(pdev); #ifdef CONFIG_NETDEVICES_MULTIQUEUE netdev = alloc_etherdev_mq(sizeof(struct ixgbe_adapter), MAX_TX_QUEUES); @@ -3721,6 +3722,7 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev) return PCI_ERS_RESULT_DISCONNECT; } pci_set_master(pdev); + pci_restore_state(pdev); pci_enable_wake(pdev, PCI_D3hot, 0); pci_enable_wake(pdev, PCI_D3cold, 0); |