From: Heiner Kallweit <hkallweit1@gmail.com>
To: bage@linutronix.de, Andrew Lunn <andrew@lunn.ch>
Cc: Russell King <linux@armlinux.org.uk>,
davem@davemloft.net, netdev@vger.kernel.org,
Benedikt Spranger <b.spranger@linutronix.de>
Subject: Re: [PATCH] phy: phy_ethtool_ksettings_set: Don't discard phy_start_aneg's return
Date: Sat, 6 Nov 2021 22:52:24 +0100 [thread overview]
Message-ID: <6e1844e5-cbee-5d50-e304-efa785405922@gmail.com> (raw)
In-Reply-To: <20211105153648.8337-1-bage@linutronix.de>
On 05.11.2021 16:36, bage@linutronix.de wrote:
> From: Bastian Germann <bage@linutronix.de>
>
> Take the return of phy_start_aneg into account so that ethtool will handle
> negotiation errors and not silently accept invalid input.
>
> Fixes: 2d55173e71b0 ("phy: add generic function to support ksetting support")
> Signed-off-by: Bastian Germann <bage@linutronix.de>
> Reviewed-by: Benedikt Spranger <b.spranger@linutronix.de>
In addition to what Andrew said already:
- This patch won't apply on net due to a4db9055fdb9.
- Patch misses the "net" annotation.
- Prefix should be "net: phy:", not "phy:".
At least the formal aspects should have been covered by the internal review.
> ---
> drivers/net/phy/phy.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
> index a3bfb156c83d..f740b533abba 100644
> --- a/drivers/net/phy/phy.c
> +++ b/drivers/net/phy/phy.c
> @@ -770,6 +770,8 @@ static int phy_poll_aneg_done(struct phy_device *phydev)
> int phy_ethtool_ksettings_set(struct phy_device *phydev,
> const struct ethtool_link_ksettings *cmd)
> {
> + int ret = 0;
Why initializing ret?
> +
> __ETHTOOL_DECLARE_LINK_MODE_MASK(advertising);
> u8 autoneg = cmd->base.autoneg;
> u8 duplex = cmd->base.duplex;
> @@ -815,10 +817,10 @@ int phy_ethtool_ksettings_set(struct phy_device *phydev,
> phydev->mdix_ctrl = cmd->base.eth_tp_mdix_ctrl;
>
> /* Restart the PHY */
> - _phy_start_aneg(phydev);
> + ret = _phy_start_aneg(phydev);
>
> mutex_unlock(&phydev->lock);
> - return 0;
> + return ret;
> }
> EXPORT_SYMBOL(phy_ethtool_ksettings_set);
>
>
next prev parent reply other threads:[~2021-11-06 21:52 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-05 15:36 [PATCH] phy: phy_ethtool_ksettings_set: Don't discard phy_start_aneg's return bage
2021-11-05 18:32 ` Andrew Lunn
2021-11-08 14:21 ` Bastian Germann
2021-11-06 21:52 ` Heiner Kallweit [this message]
2021-11-08 14:25 ` Bastian Germann
2021-11-10 8:14 ` Heiner Kallweit
2021-11-08 14:18 ` [PATCH net v2] net: " bage
2021-11-08 14:25 ` Russell King (Oracle)
2021-11-08 15:06 ` Benedikt Spranger
2021-11-08 15:40 ` Russell King (Oracle)
2021-11-08 16:09 ` Andrew Lunn
2021-11-08 16:32 ` Bastian Germann
2021-11-08 17:57 ` Andrew Lunn
2021-11-08 18:01 ` Heiner Kallweit
2021-11-08 18:06 ` Russell King (Oracle)
2021-11-08 19:02 ` Benedikt Spranger
2021-11-08 19:35 ` Heiner Kallweit
2021-11-09 18:29 ` Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6e1844e5-cbee-5d50-e304-efa785405922@gmail.com \
--to=hkallweit1@gmail.com \
--cc=andrew@lunn.ch \
--cc=b.spranger@linutronix.de \
--cc=bage@linutronix.de \
--cc=davem@davemloft.net \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).