---

yaml --- r: 37951 b: refs/heads/master c: 2f2ca26 h: refs/heads/master i: 37949: 440a100 37947: b16d853 37943: 85687a9 37935: 605da16 37919: 6fdbf11 37887: 5cb9166 v: v3
git-mirror · Sep 27, 2006 · bf549a7 · bf549a7
1 parent f6b9225
commit bf549a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git 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
@@ -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)) {