]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ixgbe: explicitly disable 100H for x540
authorEmil Tantilov <emil.s.tantilov@intel.com>
Thu, 31 Mar 2011 09:36:12 +0000 (09:36 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 27 Apr 2011 09:07:31 +0000 (02:07 -0700)
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>
drivers/net/ixgbe/ixgbe_phy.c

index fd381ea17e990cc32df3113b8dfff5ff403e3de3..edcaaebd72b24eb8054b40e842c4e3624ea933c8 100644 (file)
@@ -657,7 +657,8 @@ s32 ixgbe_setup_phy_link_tnx(struct ixgbe_hw *hw)
                                     MDIO_MMD_AN,
                                     &autoneg_reg);
 
-               autoneg_reg &= ~ADVERTISE_100FULL;
+               autoneg_reg &= ~(ADVERTISE_100FULL |
+                                ADVERTISE_100HALF);
                if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_100_FULL)
                        autoneg_reg |= ADVERTISE_100FULL;