1 files changed, 14 insertions, 6 deletions

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 21493e0cbd42..574d043cdfcd 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -6569,8 +6569,11 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
                 if (i != 2)
                         bp->fw_version[j++] = '.';
         }
-        if (REG_RD_IND(bp, bp->shmem_base + BNX2_PORT_FEATURE) &
-            BNX2_PORT_FEATURE_ASF_ENABLED) {
+        reg = REG_RD_IND(bp, bp->shmem_base + BNX2_PORT_FEATURE);
+        if (reg & BNX2_PORT_FEATURE_WOL_ENABLED)
+                bp->wol = 1;
+
+        if (reg & BNX2_PORT_FEATURE_ASF_ENABLED) {
                 bp->flags |= ASF_ENABLE_FLAG;
 
                 for (i = 0; i < 30; i++) {
@@ -6640,11 +6643,14 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
         bp->phy_port = PORT_TP;
         if (bp->phy_flags & PHY_SERDES_FLAG) {
                 bp->phy_port = PORT_FIBRE;
-                bp->flags |= NO_WOL_FLAG;
+                reg = REG_RD_IND(bp, bp->shmem_base +
+                                     BNX2_SHARED_HW_CFG_CONFIG);
+                if (!(reg & BNX2_SHARED_HW_CFG_GIG_LINK_ON_VAUX)) {
+                        bp->flags |= NO_WOL_FLAG;
+                        bp->wol = 0;
+                }
                 if (CHIP_NUM(bp) != CHIP_NUM_5706) {
                         bp->phy_addr = 2;
-                        reg = REG_RD_IND(bp, bp->shmem_base +
-                                         BNX2_SHARED_HW_CFG_CONFIG);
                         if (reg & BNX2_SHARED_HW_CFG_PHY_2_5G)
                                 bp->phy_flags |= PHY_2_5G_CAPABLE_FLAG;
                 }
@@ -6659,8 +6665,10 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 
         if ((CHIP_ID(bp) == CHIP_ID_5708_A0) ||
             (CHIP_ID(bp) == CHIP_ID_5708_B0) ||
-            (CHIP_ID(bp) == CHIP_ID_5708_B1))
+            (CHIP_ID(bp) == CHIP_ID_5708_B1)) {
                 bp->flags |= NO_WOL_FLAG;
+                bp->wol = 0;
+        }
 
         if (CHIP_ID(bp) == CHIP_ID_5706_A0) {
                 bp->tx_quick_cons_trip_int =