On Wed, 2014-03-12 at 00:02 +0100, Sebastian Hesselbarth wrote: > phy_ethtool_get_wol is a helper to get current WOL settings from > a phy device. When using this helper on a PHY without .get_wol > callback, struct ethtool_wolinfo is never set-up correctly and > may contain misleading information about WOL status. > > To fix this, always zero relevant fields of struct ethtool_wolinfo > regardless of .get_wol callback availability.
Sorry, I still disagree with this.
You're trying to make phy_ethtool_get_wol() do two subtly different
things:
- Provide an implementation of ethtool_ops::get_wol, leaving the net
driver only to look up phy_device
- Provide a standalone function for executing ETHTOOL_GWOL on a
phy_device
You may notice that phy_suspend() already sets wol.cmd = ETHTOOL_GWOL.
So it seems to me like it's taking responsibility for initialising the
structure like ethtool_get_wol() does. The bug is then that
phy_suspend() doesn't clear the rest of the structure. That is not the
responsibility of phy_ethtool_get_wol().
Ben.
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselba...@gmail.com>
> Reviewed-by: Florian Fainelli <f.faine...@gmail.com>
> ---
> Changelog:
> v1->v2:
> - clear whole struct ethtool_wolinfo
> - check for non-NULL phy_device
> v2->v3:
> - only clear ->supported and ->wolopts (Suggested by Ben Hutchings)
>
> Cc: David Miller <da...@davemloft.net>
> Cc: Florian Fainelli <f.faine...@gmail.com>
> Cc: Ben Hutchings <b...@decadent.org.uk>
> Cc: net...@vger.kernel.org
> Cc: linux-arm-ker...@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> ---
> drivers/net/phy/phy.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
> index 19c9eca0ef26..94234a91a50f 100644
> --- a/drivers/net/phy/phy.c
> +++ b/drivers/net/phy/phy.c
> @@ -1092,7 +1092,9 @@ EXPORT_SYMBOL(phy_ethtool_set_wol);
>
> void phy_ethtool_get_wol(struct phy_device *phydev, struct ethtool_wolinfo
> *wol)
> {
> - if (phydev->drv->get_wol)
> + wol->supported = wol->wolopts = 0;
> +
> + if (phydev && phydev->drv->get_wol)
> phydev->drv->get_wol(phydev, wol);
> }
> EXPORT_SYMBOL(phy_ethtool_get_wol);
--
Ben Hutchings
Experience is directly proportional to the value of equipment destroyed.
- Carolyn Scheppner
signature.asc
Description: This is a digitally signed message part
