From 457da39bc4d21cc93262bff7d90982800bbfec7a Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Thu, 3 May 2007 13:20:40 -0700
Subject: [PATCH] --- yaml --- r: 53479 b: refs/heads/master c:
 30c517b29130ddede977300235afcda1c256530b h: refs/heads/master i:   53477:
 a9592a33c1364d6015aa5f8469e50671802da6f0   53475:
 2ce606cdf8fb8176fa11010448787de512e4a370   53471:
 41e6b329836326193e084ae79eab50e105fc284d v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/bnx2.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 38b6337caae2..4525afe0792b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b2f922f6869eb13dadfe1ba3f8337bd42e50a2e
+refs/heads/master: 30c517b29130ddede977300235afcda1c256530b
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index cffdec3d5b5a..89681b30b890 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -6172,6 +6172,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state)
 		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;
 }
@@ -6185,6 +6186,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);