aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe/ixgbe_phy.c
diff options
context:
space:
mode:
authorEmil Tantilov <emil.s.tantilov@intel.com>2011-03-31 05:36:12 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-04-27 05:07:31 -0400
commit50c022e7936354d854091ebdc699872d3432e874 (patch)
treecd435e279ecba39ffa977364ac40232e6c743320 /drivers/net/ixgbe/ixgbe_phy.c
parentdbf80dcbd8ca0c50f343401fedd2d6200cb8097e (diff)
ixgbe: explicitly disable 100H for x540
100H is not supported on this HW, but the bit is set on the PHY. This can result in link at 100F when advertising only 1000F. Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com> Tested-by: Evan Swanson <evan.swanson@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_phy.c')
-rw-r--r--drivers/net/ixgbe/ixgbe_phy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_phy.c b/drivers/net/ixgbe/ixgbe_phy.c
index fd381ea17e99..edcaaebd72b2 100644
--- a/drivers/net/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ixgbe/ixgbe_phy.c
@@ -657,7 +657,8 @@ s32 ixgbe_setup_phy_link_tnx(struct ixgbe_hw *hw)
657 MDIO_MMD_AN, 657 MDIO_MMD_AN,
658 &autoneg_reg); 658 &autoneg_reg);
659 659
660 autoneg_reg &= ~ADVERTISE_100FULL; 660 autoneg_reg &= ~(ADVERTISE_100FULL |
661 ADVERTISE_100HALF);
661 if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_100_FULL) 662 if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_100_FULL)
662 autoneg_reg |= ADVERTISE_100FULL; 663 autoneg_reg |= ADVERTISE_100FULL;
663 664