diff --git a/[refs] b/[refs] index e066b61999c4..b31830fa185e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1caacecb7cb2b72e798f06a32b5061075cf397fa +refs/heads/master: 5ec6d7bf195c2e70003ff30e4f51390ef7e85a31 diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c index 49ebb5055fd4..d28cbce0ec48 100644 --- a/trunk/drivers/net/bnx2.c +++ b/trunk/drivers/net/bnx2.c @@ -7586,7 +7586,8 @@ 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) || + !(REG_RD(bp, BNX2_PCI_CONFIG_3) & BNX2_PCI_CONFIG_3_VAUX_PRESET)) { bp->flags |= BNX2_FLAG_NO_WOL; bp->wol = 0; }