-stable review patch. If anyone has any objections, please let us know. --------------------- From: This is needed to save the MSI state which will be lost during suspend. Signed-off-by: Michael Chan Signed-off-by: David S. Miller Signed-off-by: Chris Wright --- --- drivers/net/bnx2.c | 2 ++ 1 file changed, 2 insertions(+) --- linux-2.6.21.1.orig/drivers/net/bnx2.c +++ linux-2.6.21.1/drivers/net/bnx2.c @@ -6148,6 +6148,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_me reset_code = BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL; bnx2_reset_chip(bp, reset_code); bnx2_free_skbs(bp); + pci_save_state(pdev); bnx2_set_power_state(bp, pci_choose_state(pdev, state)); return 0; } @@ -6161,6 +6162,7 @@ bnx2_resume(struct pci_dev *pdev) if (!netif_running(dev)) return 0; + pci_restore_state(pdev); bnx2_set_power_state(bp, PCI_D0); netif_device_attach(dev); bnx2_init_nic(bp); -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/