From: Richard Cochran <richardcochran@gmail.com>
To: netdev@vger.kernel.org
Cc: David Miller <davem@davemloft.net>,
devicetree@vger.kernel.org, Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
Heiner Kallweit <hkallweit1@gmail.com>,
Jacob Keller <jacob.e.keller@intel.com>,
Jakub Kicinski <jakub.kicinski@netronome.com>,
Mark Rutland <mark.rutland@arm.com>,
Miroslav Lichvar <mlichvar@redhat.com>,
Murali Karicheri <m-karicheri2@ti.com>,
Rob Herring <robh+dt@kernel.org>,
Willem de Bruijn <willemb@google.com>,
Wingman Kwok <w-kwok2@ti.com>
Subject: [PATCH V7 net-next 04/11] net: ethtool: Use the PHY time stamping interface.
Date: Fri, 20 Dec 2019 10:15:13 -0800 [thread overview]
Message-ID: <f4b3781c226e0f7e22e0f69761cacb4b106876fc.1576865315.git.richardcochran@gmail.com> (raw)
In-Reply-To: <cover.1576865315.git.richardcochran@gmail.com>
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@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
---
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
next prev parent reply other threads:[~2019-12-20 18:15 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-20 18:15 [PATCH V7 net-next 00/11] Peer to Peer One-Step time stamping Richard Cochran
2019-12-20 18:15 ` [PATCH V7 net-next 01/11] net: phy: Introduce helper functions for time stamping support Richard Cochran
2019-12-20 22:24 ` Florian Fainelli
2019-12-20 18:15 ` [PATCH V7 net-next 02/11] net: macvlan: Use the PHY time stamping interface Richard Cochran
2019-12-20 22:26 ` Florian Fainelli
2019-12-20 18:15 ` [PATCH V7 net-next 03/11] net: vlan: " Richard Cochran
2019-12-20 22:26 ` Florian Fainelli
2019-12-20 18:15 ` Richard Cochran [this message]
2019-12-20 22:26 ` [PATCH V7 net-next 04/11] net: ethtool: " Florian Fainelli
2019-12-20 18:15 ` [PATCH V7 net-next 05/11] net: netcp_ethss: " Richard Cochran
2019-12-20 22:38 ` Florian Fainelli
2019-12-20 18:15 ` [PATCH V7 net-next 06/11] net: Introduce a new MII " Richard Cochran
2019-12-20 18:15 ` [PATCH V7 net-next 07/11] net: Add a layer for non-PHY MII time stamping drivers Richard Cochran
2019-12-21 10:32 ` Andrew Lunn
2019-12-20 18:15 ` [PATCH V7 net-next 08/11] dt-bindings: ptp: Introduce MII time stamping devices Richard Cochran
2019-12-20 18:15 ` [PATCH V7 net-next 09/11] net: mdio: of: Register discovered MII time stampers Richard Cochran
2019-12-20 22:41 ` Florian Fainelli
2019-12-20 18:15 ` [PATCH V7 net-next 10/11] net: Introduce peer to peer one step PTP time stamping Richard Cochran
2019-12-20 18:15 ` [PATCH V7 net-next 11/11] ptp: Add a driver for InES time stamping IP core Richard Cochran
2019-12-21 10:56 ` Andrew Lunn
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=f4b3781c226e0f7e22e0f69761cacb4b106876fc.1576865315.git.richardcochran@gmail.com \
--to=richardcochran@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=jacob.e.keller@intel.com \
--cc=jakub.kicinski@netronome.com \
--cc=m-karicheri2@ti.com \
--cc=mark.rutland@arm.com \
--cc=mlichvar@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=w-kwok2@ti.com \
--cc=willemb@google.com \
/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).