From bf549a796f5bf7a23b34b926d0fa1828a287286e Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Wed, 27 Sep 2006 12:53:40 -0700
Subject: [PATCH] --- yaml --- r: 37951 b: refs/heads/master c:
 2f2ca2638cbcf287b87a1e199f949a0c03bc0cf7 h: refs/heads/master i:   37949:
 440a1002274ba9a4dd26be3e3db01a47193bedb4   37947:
 b16d8538e7813d8acf2b4b6b2796eac741136f82   37943:
 85687a9a4f8a620b91b78b1ea4c76a11d386f06d   37935:
 605da1670566497daac84bcbedfb02a44c19473c   37919:
 6fdbf11a2490df515090c26421ff04c35e3a6541   37887:
 5cb91664a665da84e37cab5a5f398716d8c901a9 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/net/e1000/e1000_ethtool.c | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 0e815983bf49..6fec8c6af45f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49559854c9ea6d6950631d558d33faff49fa74f3
+refs/heads/master: 2f2ca2638cbcf287b87a1e199f949a0c03bc0cf7
diff --git a/trunk/drivers/net/e1000/e1000_ethtool.c b/trunk/drivers/net/e1000/e1000_ethtool.c
index 9791b8a1a096..5edf8a099ceb 100644
--- a/trunk/drivers/net/e1000/e1000_ethtool.c
+++ b/trunk/drivers/net/e1000/e1000_ethtool.c
@@ -211,13 +211,9 @@ e1000_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 				     ADVERTISED_FIBRE |
 				     ADVERTISED_Autoneg;
 		else
-			hw->autoneg_advertised = ADVERTISED_10baseT_Half |
-						  ADVERTISED_10baseT_Full |
-						  ADVERTISED_100baseT_Half |
-						  ADVERTISED_100baseT_Full |
-						  ADVERTISED_1000baseT_Full|
-						  ADVERTISED_Autoneg |
-						  ADVERTISED_TP;
+			hw->autoneg_advertised = ecmd->advertising |
+			                         ADVERTISED_TP |
+			                         ADVERTISED_Autoneg;
 		ecmd->advertising = hw->autoneg_advertised;
 	} else
 		if (e1000_set_spd_dplx(adapter, ecmd->speed + ecmd->duplex)) {