From 1d6a87bf46cea1be6296ed66adf049b225b449a7 Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Mon, 8 Jan 2007 19:55:46 -0800 Subject: [PATCH] --- yaml --- r: 45407 b: refs/heads/master c: 261dd5ca05c6f36c9216f2d60b018f59f92620c4 h: refs/heads/master i: 45405: 5016368666b410f12c4c397a77dfaf776ce14aa8 45403: 5545df029ffe0f589402224dcdfb6633f8ad91b3 45399: 1c45fad2407ffaea99f7d15f79fd86cf4585235a 45391: 40734212838a5ec1cf538950f6e29cb45b465f20 45375: 6edf834af2d3be26f28aa9b951f2df0793994352 v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ac9f64bb4985..6f1947c15e6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a2f11c227bdf292b3a2900ad04139d301b56ac4 +refs/heads/master: 261dd5ca05c6f36c9216f2d60b018f59f92620c4 diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c index ada5e9b9988c..8d682fc37607 100644 --- a/trunk/drivers/net/bnx2.c +++ b/trunk/drivers/net/bnx2.c @@ -1345,8 +1345,6 @@ bnx2_init_copper_phy(struct bnx2 *bp) { u32 val; - bp->phy_flags |= PHY_CRC_FIX_FLAG; - if (bp->phy_flags & PHY_CRC_FIX_FLAG) { bnx2_write_phy(bp, 0x18, 0x0c00); bnx2_write_phy(bp, 0x17, 0x000a); @@ -5880,7 +5878,9 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) if (reg & BNX2_SHARED_HW_CFG_PHY_2_5G) bp->phy_flags |= PHY_2_5G_CAPABLE_FLAG; } - } + } else if (CHIP_NUM(bp) == CHIP_NUM_5706 || + CHIP_NUM(bp) == CHIP_NUM_5708) + bp->phy_flags |= PHY_CRC_FIX_FLAG; if ((CHIP_ID(bp) == CHIP_ID_5708_A0) || (CHIP_ID(bp) == CHIP_ID_5708_B0) ||