From: "Köry Maincent" <kory.maincent@bootlin.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-doc@vger.kernel.org
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Jonathan Corbet <corbet@lwn.net>,
Jay Vosburgh <j.vosburgh@gmail.com>,
Andy Gospodarek <andy@greyhouse.net>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Claudiu Beznea <claudiu.beznea@tuxon.dev>,
Horatiu Vultur <horatiu.vultur@microchip.com>,
UNGLinuxDriver@microchip.com,
Florian Fainelli <florian.fainelli@broadcom.com>,
Broadcom internal kernel review list
<bcm-kernel-feedback-list@broadcom.com>,
Andrew Lunn <andrew@lunn.ch>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
Richard Cochran <richardcochran@gmail.com>,
Radu Pirea <radu-nicolae.pirea@oss.nxp.com>,
Willem de Bruijn <willemdebruijn.kernel@gmail.com>,
Vladimir Oltean <vladimir.oltean@nxp.com>,
Michael Walle <michael@walle.cc>,
Jacob Keller <jacob.e.keller@intel.com>,
Maxime Chevallier <maxime.chevallier@bootlin.com>,
Kory Maincent <kory.maincent@bootlin.com>
Subject: [PATCH net-next v5 14/16] net: ethtool: ts: Update GET_TS to reply the current selected timestamp
Date: Mon, 9 Oct 2023 17:51:36 +0200 [thread overview]
Message-ID: <20231009155138.86458-15-kory.maincent@bootlin.com> (raw)
In-Reply-To: <20231009155138.86458-1-kory.maincent@bootlin.com>
From: Kory Maincent <kory.maincent@bootlin.com>
As the default selected timestamp API change we have to change also the
timestamp return by ethtool. This patch return now the current selected
timestamp.
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---
net/ethtool/ts.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/net/ethtool/ts.c b/net/ethtool/ts.c
index d52b9800dc3b..11041a16de5b 100644
--- a/net/ethtool/ts.c
+++ b/net/ethtool/ts.c
@@ -31,19 +31,13 @@ static int ts_prepare_data(const struct ethnl_req_info *req_base,
{
struct ts_reply_data *data = TS_REPDATA(reply_base);
struct net_device *dev = reply_base->dev;
- const struct ethtool_ops *ops = dev->ethtool_ops;
int ret;
ret = ethnl_ops_begin(dev);
if (ret < 0)
return ret;
- if (phy_has_tsinfo(dev->phydev))
- data->ts_layer = PHYLIB_TIMESTAMPING;
- else if (ops->get_ts_info)
- data->ts_layer = NETDEV_TIMESTAMPING;
- else
- data->ts_layer = NO_TIMESTAMPING;
+ data->ts_layer = dev->ts_layer;
ethnl_ops_complete(dev);
--
2.25.1
next prev parent reply other threads:[~2023-10-09 15:52 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-09 15:51 [PATCH net-next v5 00/16] net: Make timestamping selectable Köry Maincent
2023-10-09 15:51 ` [PATCH net-next v5 01/16] net: Convert PHYs hwtstamp callback to use kernel_hwtstamp_config Köry Maincent
2023-10-09 21:02 ` Florian Fainelli
2023-10-10 15:37 ` Simon Horman
2023-10-11 8:27 ` Köry Maincent
2023-10-20 20:23 ` kernel test robot
2023-10-09 15:51 ` [PATCH net-next v5 02/16] net: phy: Remove the call to phy_mii_ioctl in phy_hwstamp_get/set Köry Maincent
2023-10-09 21:04 ` Florian Fainelli
2023-10-09 15:51 ` [PATCH net-next v5 03/16] net: ethtool: Refactor identical get_ts_info implementations Köry Maincent
2023-10-09 19:56 ` kernel test robot
2023-10-09 21:06 ` Florian Fainelli
2023-10-11 21:41 ` Jay Vosburgh
2023-10-09 15:51 ` [PATCH net-next v5 04/16] net: macb: Convert to ndo_hwtstamp_get() and ndo_hwtstamp_set() Köry Maincent
2023-10-09 21:08 ` Florian Fainelli
2023-10-09 15:51 ` [PATCH net-next v5 05/16] net: Make dev_set_hwtstamp_phylib accessible Köry Maincent
2023-10-09 21:09 ` Florian Fainelli
2023-10-10 7:40 ` Köry Maincent
2023-10-09 15:51 ` [PATCH net-next v5 06/16] net_tstamp: Add TIMESTAMPING SOFTWARE and HARDWARE mask Köry Maincent
2023-10-09 21:11 ` Florian Fainelli
2023-10-09 15:51 ` [PATCH net-next v5 07/16] net: phy: micrel: fix ts_info value in case of no phc Köry Maincent
2023-10-09 21:14 ` Florian Fainelli
2023-10-09 15:51 ` [PATCH net-next v5 08/16] net: ethtool: Add a command to expose current time stamping layer Köry Maincent
2023-10-09 21:20 ` Florian Fainelli
2023-10-10 8:23 ` Köry Maincent
2023-10-13 16:00 ` Jakub Kicinski
2023-10-13 16:11 ` Andrew Lunn
2023-10-16 10:41 ` Köry Maincent
2023-10-16 14:22 ` Jakub Kicinski
2023-10-16 15:00 ` Köry Maincent
2023-10-16 15:43 ` Jakub Kicinski
2023-10-16 16:23 ` Köry Maincent
2023-10-16 17:03 ` Jakub Kicinski
2023-10-16 23:03 ` Jacob Keller
2023-10-17 9:21 ` Köry Maincent
2023-10-16 23:50 ` Richard Cochran
2023-10-17 8:29 ` Köry Maincent
2023-10-13 16:14 ` Vladimir Oltean
2023-10-13 16:30 ` Jakub Kicinski
2023-10-13 17:09 ` Vladimir Oltean
2023-10-13 17:46 ` Jakub Kicinski
2023-10-13 17:56 ` Vladimir Oltean
2023-10-13 20:15 ` Jakub Kicinski
2023-10-09 15:51 ` [PATCH net-next v5 09/16] netlink: specs: Introduce new netlink command to get current timestamp Köry Maincent
2023-10-09 21:21 ` Florian Fainelli
2023-10-10 8:40 ` Köry Maincent
2023-10-09 15:51 ` [PATCH net-next v5 10/16] net: ethtool: Add a command to list available time stamping layers Köry Maincent
2023-10-13 22:52 ` kernel test robot
2023-10-09 15:51 ` [PATCH net-next v5 11/16] netlink: specs: Introduce new netlink " Köry Maincent
2023-10-09 21:22 ` Florian Fainelli
2023-10-09 15:51 ` [PATCH net-next v5 12/16] net: Replace hwtstamp_source by timestamping layer Köry Maincent
2023-10-09 21:23 ` Florian Fainelli
2023-10-09 15:51 ` [PATCH net-next v5 13/16] net: Change the API of PHY default timestamp to MAC Köry Maincent
2023-10-09 22:23 ` Florian Fainelli
2023-10-10 15:52 ` Simon Horman
2023-10-13 1:37 ` kernel test robot
2023-10-09 15:51 ` Köry Maincent [this message]
2023-10-09 15:51 ` [PATCH net-next v5 15/16] net ethtool: net: Let the active time stamping layer be selectable Köry Maincent
2023-10-09 21:28 ` Florian Fainelli
2023-10-10 8:31 ` Köry Maincent
2023-10-09 15:51 ` [PATCH net-next v5 16/16] netlink: specs: Introduce time stamping set command Köry Maincent
2023-10-09 21: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=20231009155138.86458-15-kory.maincent@bootlin.com \
--to=kory.maincent@bootlin.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=andy@greyhouse.net \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=claudiu.beznea@tuxon.dev \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=florian.fainelli@broadcom.com \
--cc=hkallweit1@gmail.com \
--cc=horatiu.vultur@microchip.com \
--cc=j.vosburgh@gmail.com \
--cc=jacob.e.keller@intel.com \
--cc=kuba@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=maxime.chevallier@bootlin.com \
--cc=michael@walle.cc \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=pabeni@redhat.com \
--cc=radu-nicolae.pirea@oss.nxp.com \
--cc=richardcochran@gmail.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=vladimir.oltean@nxp.com \
--cc=willemdebruijn.kernel@gmail.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).