From nobody Fri Dec 19 19:16:32 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA661C4332F for ; Tue, 14 Nov 2023 11:30:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233145AbjKNLak (ORCPT ); Tue, 14 Nov 2023 06:30:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232771AbjKNL3t (ORCPT ); Tue, 14 Nov 2023 06:29:49 -0500 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 292AF1985; Tue, 14 Nov 2023 03:29:08 -0800 (PST) Received: by mail.gandi.net (Postfix) with ESMTPSA id B88B46000E; Tue, 14 Nov 2023 11:29:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1699961347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hnH2ZHMI5dsTwImD1KGet0qz4ilreT1GWjYY2D79LCc=; b=JZZhCAkwLMySeO8vgV2JsnvWUEIrHRJyThv0gLJGivHrKuLh62GdVSUDWcw3rdmBRPbCcA zYFs+i7xoUgHF5xiUm+vF3j7po1EbgFmRTBt3RyBHGuFwU8Bywa3i1jpGtgDRKr6gM/1Ln t9Flxjj2XTpP1YuAnoTfLLnbh7CS4BnJZStVsMRRz+aC3PZTD5am43YaDIw6XOqSzGbMGF /ubfTJu6B90f+3wwaeV4DESklHs2bfnumb207Mzu9NgBxnnAMRr85eow9zlwC4+mrxVibw oxwT2b9wPFcOE0XoDYpCpM4Z+Hf79cwpWLNBO8cAynnZfuShrAsN/I2+oflqlQ== From: Kory Maincent Date: Tue, 14 Nov 2023 12:28:42 +0100 Subject: [PATCH net-next v7 14/16] net: ethtool: ts: Update GET_TS to reply the current selected timestamp MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231114-feature_ptp_netnext-v7-14-472e77951e40@bootlin.com> References: <20231114-feature_ptp_netnext-v7-0-472e77951e40@bootlin.com> In-Reply-To: <20231114-feature_ptp_netnext-v7-0-472e77951e40@bootlin.com> To: Florian Fainelli , Broadcom internal kernel review list , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Radu Pirea , Jay Vosburgh , Andy Gospodarek , Nicolas Ferre , Claudiu Beznea , Willem de Bruijn , Jonathan Corbet , Horatiu Vultur , UNGLinuxDriver@microchip.com, Simon Horman , Vladimir Oltean Cc: Thomas Petazzoni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Maxime Chevallier , Kory Maincent X-Mailer: b4 0.12.4 X-GND-Sasl: kory.maincent@bootlin.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- net/ethtool/ts.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/net/ethtool/ts.c b/net/ethtool/ts.c index f2dd65a2e69c..bd219512b8de 100644 --- a/net/ethtool/ts.c +++ b/net/ethtool/ts.c @@ -31,29 +31,13 @@ static int ts_prepare_data(const struct ethnl_req_info = *req_base, { struct ts_reply_data *data =3D TS_REPDATA(reply_base); struct net_device *dev =3D reply_base->dev; - const struct ethtool_ops *ops =3D dev->ethtool_ops; int ret; =20 ret =3D ethnl_ops_begin(dev); if (ret < 0) return ret; =20 - if (phy_has_tsinfo(dev->phydev)) { - data->ts_layer =3D PHY_TIMESTAMPING; - } else if (ops->get_ts_info) { - struct ethtool_ts_info ts_info =3D {0}; - - ops->get_ts_info(dev, &ts_info); - if (ts_info.so_timestamping & - SOF_TIMESTAMPING_HARDWARE_MASK) - data->ts_layer =3D MAC_TIMESTAMPING; - - if (ts_info.so_timestamping & - SOF_TIMESTAMPING_SOFTWARE_MASK) - data->ts_layer =3D SOFTWARE_TIMESTAMPING; - } else { - data->ts_layer =3D NO_TIMESTAMPING; - } + data->ts_layer =3D dev->ts_layer; =20 ethnl_ops_complete(dev); =20 --=20 2.25.1