From mboxrd@z Thu Jan 1 00:00:00 1970 From: Giuseppe CAVALLARO Subject: Re: [PATCH 1/2] net/stmmac: don't go through ethtool to start autonegociation Date: Tue, 10 May 2011 15:47:00 +0200 Message-ID: <4DC941D4.8030409@st.com> References: <1304986748-15809-1-git-send-email-decot@google.com> <1304986748-15809-2-git-send-email-decot@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: "David S. Miller" , Joe Perches , Stanislaw Gruszka , netdev@vger.kernel.org, linux-kernel@vger.kernel.org To: David Decotigny Return-path: In-Reply-To: <1304986748-15809-2-git-send-email-decot@google.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org On 5/10/2011 2:19 AM, David Decotigny wrote: > The driver used to call phy's ethtool configuration routine to start > autonegociation. This change has it call directly phy's routine to > start autonegociation. > > IMPORTANT: initial version was hiding phy_start_aneg() return value, > this patch returns it (<0 upon error). > > Tested: module compiles, NOT tested on real hardware. > Signed-off-by: David Decotigny Sorry for the delay, I'm doing some tests with the stmmac on a "real" HW. I'll come back asap. Regards Peppe > --- > drivers/net/stmmac/stmmac_ethtool.c | 13 ++----------- > 1 files changed, 2 insertions(+), 11 deletions(-) > > diff --git a/drivers/net/stmmac/stmmac_ethtool.c b/drivers/net/stmmac/stmmac_ethtool.c > index 6f5aaeb..9c05cf0 100644 > --- a/drivers/net/stmmac/stmmac_ethtool.c > +++ b/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);