From 09657fd0d6d5adcbdf32a121fffd0020af5ed491 Mon Sep 17 00:00:00 2001
From: David Decotigny <decot@google.com>
Date: Thu, 12 May 2011 20:28:04 +0000
Subject: [PATCH] --- yaml --- r: 247447 b: refs/heads/master c:
 1334cb60826377de8f75adb9902c25302222f4fe h: refs/heads/master i:   247445:
 cf78cd570a046ab969d662ceef5a0144ca8e73ca   247443:
 2cfa8ec7307a9d2dbe8a0da237b25382660d60cb   247439:
 550394111b4d3b0e9e0e3f13a022bfec593bfb01 v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/net/stmmac/stmmac_ethtool.c | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 0863aaba435f..e2b7daeb0956 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5310cbce900094dce5df4a671b411e15319a75d4
+refs/heads/master: 1334cb60826377de8f75adb9902c25302222f4fe
diff --git a/trunk/drivers/net/stmmac/stmmac_ethtool.c b/trunk/drivers/net/stmmac/stmmac_ethtool.c
index 6f5aaeb986ff..9c05cf07a432 100644
--- a/trunk/drivers/net/stmmac/stmmac_ethtool.c
+++ b/trunk/drivers/net/stmmac/stmmac_ethtool.c
@@ -236,17 +236,8 @@ stmmac_set_pauseparam(struct net_device *netdev,
 	priv->flow_ctrl = new_pause;
 
 	if (phy->autoneg) {
-		if (netif_running(netdev)) {
-			struct ethtool_cmd cmd = { .cmd = ETHTOOL_SSET };
-			/* auto-negotiation automatically restarted */
-			cmd.supported = phy->supported;
-			cmd.advertising = phy->advertising;
-			cmd.autoneg = phy->autoneg;
-			ethtool_cmd_speed_set(&cmd, phy->speed);
-			cmd.duplex = phy->duplex;
-			cmd.phy_address = phy->addr;
-			ret = phy_ethtool_sset(phy, &cmd);
-		}
+		if (netif_running(netdev))
+			ret = phy_start_aneg(phy);
 	} else
 		priv->hw->mac->flow_ctrl(priv->ioaddr, phy->duplex,
 					 priv->flow_ctrl, priv->pause);