aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2.c
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2007-01-08 22:55:46 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-01-09 03:30:02 -0500
commit261dd5ca05c6f36c9216f2d60b018f59f92620c4 (patch)
tree17a82e920164fd426a2c0c4d8c34f2778dd890be /drivers/net/bnx2.c
parent2a2f11c227bdf292b3a2900ad04139d301b56ac4 (diff)
[BNX2]: Don't apply CRC PHY workaround to 5709.
The workaround is only needed on 5706/5708 and cannot be applied on 5709. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r--drivers/net/bnx2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index ada5e9b9988c..8d682fc37607 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -1345,8 +1345,6 @@ bnx2_init_copper_phy(struct bnx2 *bp)
1345{ 1345{
1346 u32 val; 1346 u32 val;
1347 1347
1348 bp->phy_flags |= PHY_CRC_FIX_FLAG;
1349
1350 if (bp->phy_flags & PHY_CRC_FIX_FLAG) { 1348 if (bp->phy_flags & PHY_CRC_FIX_FLAG) {
1351 bnx2_write_phy(bp, 0x18, 0x0c00); 1349 bnx2_write_phy(bp, 0x18, 0x0c00);
1352 bnx2_write_phy(bp, 0x17, 0x000a); 1350 bnx2_write_phy(bp, 0x17, 0x000a);
@@ -5880,7 +5878,9 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
5880 if (reg & BNX2_SHARED_HW_CFG_PHY_2_5G) 5878 if (reg & BNX2_SHARED_HW_CFG_PHY_2_5G)
5881 bp->phy_flags |= PHY_2_5G_CAPABLE_FLAG; 5879 bp->phy_flags |= PHY_2_5G_CAPABLE_FLAG;
5882 } 5880 }
5883 } 5881 } else if (CHIP_NUM(bp) == CHIP_NUM_5706 ||
5882 CHIP_NUM(bp) == CHIP_NUM_5708)
5883 bp->phy_flags |= PHY_CRC_FIX_FLAG;
5884 5884
5885 if ((CHIP_ID(bp) == CHIP_ID_5708_A0) || 5885 if ((CHIP_ID(bp) == CHIP_ID_5708_A0) ||
5886 (CHIP_ID(bp) == CHIP_ID_5708_B0) || 5886 (CHIP_ID(bp) == CHIP_ID_5708_B0) ||