stmmac: don't go through ethtool to start auto-negotiation
David Decotigny [Thu, 12 May 2011 20:28:04 +0000 (20:28 +0000)]
The driver used to call phy's ethtool configuration routine to start
auto-negotiation. This change has it call directly phy's routine to
start auto-negotiation.

The initial version was hiding phy_start_aneg() return value,
this patch returns it (<0 upon error).

Tested: module compiles, tested on STM HDK7108 STB.

Signed-off-by: David Decotigny <decot@google.com>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/net/stmmac/stmmac_ethtool.c

index 6f5aaeb..9c05cf0 100644 (file)
@@ -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);