From cc548c7001f6e56250ab73d6da6905a82ce4c136 Mon Sep 17 00:00:00 2001
From: Emil Tantilov <emil.s.tantilov@intel.com>
Date: Thu, 31 Mar 2011 09:36:12 +0000
Subject: [PATCH] --- yaml --- r: 246988 b: refs/heads/master c:
 50c022e7936354d854091ebdc699872d3432e874 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/ixgbe/ixgbe_phy.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index af0a3f8d9695..39c6442a2159 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbf80dcbd8ca0c50f343401fedd2d6200cb8097e
+refs/heads/master: 50c022e7936354d854091ebdc699872d3432e874
diff --git a/trunk/drivers/net/ixgbe/ixgbe_phy.c b/trunk/drivers/net/ixgbe/ixgbe_phy.c
index fd381ea17e99..edcaaebd72b2 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_phy.c
+++ b/trunk/drivers/net/ixgbe/ixgbe_phy.c
@@ -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;