]> git.dujemihanovic.xyz Git - linux.git/commitdiff
net: macb: Remove setting of RX software timestamp
authorGal Pressman <gal@nvidia.com>
Fri, 6 Sep 2024 14:46:21 +0000 (17:46 +0300)
committerJakub Kicinski <kuba@kernel.org>
Tue, 10 Sep 2024 00:44:40 +0000 (17:44 -0700)
The responsibility for reporting of RX software timestamp has moved to
the core layer (see __ethtool_get_ts_info()), remove usage from the
device drivers.

Reviewed-by: Carolina Jubran <cjubran@nvidia.com>
Reviewed-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>
Signed-off-by: Gal Pressman <gal@nvidia.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Link: https://patch.msgid.link/20240906144632.404651-6-gal@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/cadence/macb_main.c

index 8e1e4b2b23869291b3fbbc38ba4a57f92c78aed2..f06babec04a0bf0a1095dd9e95ff60aa3ce07bef 100644 (file)
@@ -3410,8 +3410,6 @@ static int gem_get_ts_info(struct net_device *dev,
 
        info->so_timestamping =
                SOF_TIMESTAMPING_TX_SOFTWARE |
-               SOF_TIMESTAMPING_RX_SOFTWARE |
-               SOF_TIMESTAMPING_SOFTWARE |
                SOF_TIMESTAMPING_TX_HARDWARE |
                SOF_TIMESTAMPING_RX_HARDWARE |
                SOF_TIMESTAMPING_RAW_HARDWARE;
@@ -3423,7 +3421,8 @@ static int gem_get_ts_info(struct net_device *dev,
                (1 << HWTSTAMP_FILTER_NONE) |
                (1 << HWTSTAMP_FILTER_ALL);
 
-       info->phc_index = bp->ptp_clock ? ptp_clock_index(bp->ptp_clock) : -1;
+       if (bp->ptp_clock)
+               info->phc_index = ptp_clock_index(bp->ptp_clock);
 
        return 0;
 }