diff options
| author | David S. Miller <davem@davemloft.net> | 2024-09-06 09:34:19 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-09-06 09:34:19 +0100 |
| commit | 52fc70a32573707f70d6b1b5c5fe85cc91457393 (patch) | |
| tree | 8825591532849f190636e028ab571b45ce0476c7 /drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c | |
| parent | 2c4cec1643d1aee40c9cbf37ae829aa35fa1183b (diff) | |
| parent | 26f74155df44fdcbc1962a7f404be6a8eec895e0 (diff) | |
Merge branch 'rx-sw-tstamp-for-all'
Gal Pressman says:
====================
RX software timestamp for all - round 2
Round 1 of drivers conversion was merged [1], this is round 2, more
drivers to follow.
[1] https://lore.kernel.org/netdev/20240901112803.212753-1-gal@nvidia.com/
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c b/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c index 4f800c1a435d..d898a7238b48 100644 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c @@ -1194,16 +1194,13 @@ static int sparx5_get_ts_info(struct net_device *dev, phc = &sparx5->phc[SPARX5_PHC_PORT]; - info->phc_index = phc->clock ? ptp_clock_index(phc->clock) : -1; - if (info->phc_index == -1) { - info->so_timestamping |= SOF_TIMESTAMPING_TX_SOFTWARE | - SOF_TIMESTAMPING_RX_SOFTWARE | - SOF_TIMESTAMPING_SOFTWARE; + if (phc->clock) { + info->phc_index = ptp_clock_index(phc->clock); + } else { + info->so_timestamping |= SOF_TIMESTAMPING_TX_SOFTWARE; return 0; } 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; |