| Message ID | 20240906144632.404651-15-gal@nvidia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9364fa7fcf127514e2b740bc606f719ae5bc5961 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | RX software timestamp for all - round 3 | expand |
On Fri, 6 Sep 2024 17:46:30 +0300 Gal Pressman wrote: > 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> > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c > index 7008219fd88d..a7b8407e898c 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c > @@ -1207,13 +1207,13 @@ static int stmmac_get_ts_info(struct net_device *dev, > > info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE | > SOF_TIMESTAMPING_TX_HARDWARE | > - SOF_TIMESTAMPING_RX_SOFTWARE | > SOF_TIMESTAMPING_RX_HARDWARE | > - SOF_TIMESTAMPING_SOFTWARE | > SOF_TIMESTAMPING_RAW_HARDWARE; > > if (priv->ptp_clock) > info->phc_index = ptp_clock_index(priv->ptp_clock); > + else > + info->phc_index = 0; Would have been good to explain the unusual change to phc_index in the commit message.
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c index 7008219fd88d..a7b8407e898c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c @@ -1207,13 +1207,13 @@ static int stmmac_get_ts_info(struct net_device *dev, info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE | SOF_TIMESTAMPING_TX_HARDWARE | - SOF_TIMESTAMPING_RX_SOFTWARE | SOF_TIMESTAMPING_RX_HARDWARE | - SOF_TIMESTAMPING_SOFTWARE | SOF_TIMESTAMPING_RAW_HARDWARE; if (priv->ptp_clock) info->phc_index = ptp_clock_index(priv->ptp_clock); + else + info->phc_index = 0; info->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON);