From 0b464cedc4070131cc02ae5bc7c388d35d21a541 Mon Sep 17 00:00:00 2001
From: Dmitry Kravkov <dmitry@broadcom.com>
Date: Wed, 4 May 2011 23:49:11 +0000
Subject: [PATCH] --- yaml --- r: 247079 b: refs/heads/master c:
 f9a3ebbe657b5dcd562224b32d1703da499063db h: refs/heads/master i:   247077:
 21e9833e605e7edf76dff6a01fd2a6fe9ae5122e   247075:
 7f93e12680918701edb7d40b88b70f93540fafbb   247071:
 4c90494a6c53395b6452c4cdec829496c2661899 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/net/bnx2x/bnx2x_main.c | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 4e77709e9c5d..477f9f18b4cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ae17f666099c952053eea7c64cac8189dd76f72
+refs/heads/master: f9a3ebbe657b5dcd562224b32d1703da499063db
diff --git a/trunk/drivers/net/bnx2x/bnx2x_main.c b/trunk/drivers/net/bnx2x/bnx2x_main.c
index 3f4ff41cd333..1b3c9f664306 100644
--- a/trunk/drivers/net/bnx2x/bnx2x_main.c
+++ b/trunk/drivers/net/bnx2x/bnx2x_main.c
@@ -8052,13 +8052,9 @@ static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp)
 		(val >= REQ_BC_VER_4_VRFY_SPECIFIC_PHY_OPT_MDL) ?
 		FEATURE_CONFIG_BC_SUPPORTS_DUAL_PHY_OPT_MDL_VRFY : 0;
 
-	if (BP_E1HVN(bp) == 0) {
-		pci_read_config_word(bp->pdev, bp->pm_cap + PCI_PM_PMC, &pmc);
-		bp->flags |= (pmc & PCI_PM_CAP_PME_D3cold) ? 0 : NO_WOL_FLAG;
-	} else {
-		/* no WOL capability for E1HVN != 0 */
-		bp->flags |= NO_WOL_FLAG;
-	}
+	pci_read_config_word(bp->pdev, bp->pm_cap + PCI_PM_PMC, &pmc);
+	bp->flags |= (pmc & PCI_PM_CAP_PME_D3cold) ? 0 : NO_WOL_FLAG;
+
 	BNX2X_DEV_INFO("%sWoL capable\n",
 		       (bp->flags & NO_WOL_FLAG) ? "not " : "");