lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 25 Dec 2019 18:16:12 -0800 From: Richard Cochran <richardcochran@...il.com> To: netdev@...r.kernel.org Cc: David Miller <davem@...emloft.net>, devicetree@...r.kernel.org, Andrew Lunn <andrew@...n.ch>, Florian Fainelli <f.fainelli@...il.com>, Heiner Kallweit <hkallweit1@...il.com>, Jacob Keller <jacob.e.keller@...el.com>, Jakub Kicinski <jakub.kicinski@...ronome.com>, Mark Rutland <mark.rutland@....com>, Miroslav Lichvar <mlichvar@...hat.com>, Murali Karicheri <m-karicheri2@...com>, Rob Herring <robh+dt@...nel.org>, Willem de Bruijn <willemb@...gle.com>, Wingman Kwok <w-kwok2@...com> Subject: [PATCH V9 net-next 04/12] net: ethtool: Use the PHY time stamping interface. The ethtool layer tests fields of the phy_device in order to determine whether to invoke the PHY's tsinfo ethtool callback. This patch replaces the open coded logic with an invocation of the proper methods. Signed-off-by: Richard Cochran <richardcochran@...il.com> Reviewed-by: Andrew Lunn <andrew@...n.ch> Reviewed-by: Florian Fainelli <f.fainelli@...il.com> --- net/ethtool/ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index aed2c2cf1623..88f7cddf5a6f 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -2096,8 +2096,8 @@ static int ethtool_get_ts_info(struct net_device *dev, void __user *useraddr) memset(&info, 0, sizeof(info)); info.cmd = ETHTOOL_GET_TS_INFO; - if (phydev && phydev->drv && phydev->drv->ts_info) { - err = phydev->drv->ts_info(phydev, &info); + if (phy_has_tsinfo(phydev)) { + err = phy_ts_info(phydev, &info); } else if (ops->get_ts_info) { err = ops->get_ts_info(dev, &info); } else { -- 2.20.1
Powered by blists - more mailing lists