github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-10 12:28:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: remove legacy way to get/set HW timestamp config

Browse Source 
With all drivers converted to use ndo_hwstamp callbacks the legacy way
can be removed, marking ioctl interface as deprecated.

Signed-off-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>
Link: https://patch.msgid.link/20260116062121.1230184-1-vadim.fedorenko@linux.dev
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Vadim Fedorenko 2026-01-16 06:21:20 +00:00 committed by Jakub Kicinski
parent 3fbb5395c7
commit 5062245a5a
3 changed files with 21 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/networking/timestamping.rst
View File

@ -627,10 +627,9 @@ ioctl(SIOCSHWTSTAMP). However, this has not been implemented in all drivers.
-------------------------------------------------------- --------------------------------------------------------
A driver which supports hardware time stamping must support the A driver which supports hardware time stamping must support the
ndo_hwtstamp_set NDO or the legacy SIOCSHWTSTAMP ioctl and update the ndo_hwtstamp_set NDO and update the supplied struct hwtstamp_config with
supplied struct hwtstamp_config with the actual values as described in the actual values as described in the section on SIOCSHWTSTAMP. It
the section on SIOCSHWTSTAMP. It should also support ndo_hwtstamp_get or should also support ndo_hwtstamp_get NDO to retrieve configuration.
the legacy SIOCGHWTSTAMP.
Time stamps for received packets must be stored in the skb. To get a pointer Time stamps for received packets must be stored in the skb. To get a pointer
to the shared time stamp structure of the skb call skb_hwtstamps(). Then to the shared time stamp structure of the skb call skb_hwtstamps(). Then

6
drivers/infiniband/ulp/ipoib/ipoib_main.c
View File

@ -1831,8 +1831,7 @@ static int ipoib_hwtstamp_get(struct net_device *dev,
struct ipoib_dev_priv *priv = ipoib_priv(dev); struct ipoib_dev_priv *priv = ipoib_priv(dev);
if (!priv->rn_ops->ndo_hwtstamp_get) if (!priv->rn_ops->ndo_hwtstamp_get)
/* legacy */ return -EOPNOTSUPP;
return dev_eth_ioctl(dev, config->ifr, SIOCGHWTSTAMP);
return priv->rn_ops->ndo_hwtstamp_get(dev, config); return priv->rn_ops->ndo_hwtstamp_get(dev, config);
} }
@ -1844,8 +1843,7 @@ static int ipoib_hwtstamp_set(struct net_device *dev,
struct ipoib_dev_priv *priv = ipoib_priv(dev); struct ipoib_dev_priv *priv = ipoib_priv(dev);
if (!priv->rn_ops->ndo_hwtstamp_set) if (!priv->rn_ops->ndo_hwtstamp_set)
/* legacy */ return -EOPNOTSUPP;
return dev_eth_ioctl(dev, config->ifr, SIOCSHWTSTAMP);
return priv->rn_ops->ndo_hwtstamp_set(dev, config, extack); return priv->rn_ops->ndo_hwtstamp_set(dev, config, extack);
} }

60
net/core/dev_ioctl.c
View File

@ -287,7 +287,7 @@ static int dev_get_hwtstamp(struct net_device *dev, struct ifreq *ifr)
int err; int err;
if (!ops->ndo_hwtstamp_get) if (!ops->ndo_hwtstamp_get)
return dev_eth_ioctl(dev, ifr, SIOCGHWTSTAMP); /* legacy */ return -EOPNOTSUPP;
if (!netif_device_present(dev)) if (!netif_device_present(dev))
return -ENODEV; return -ENODEV;
@ -414,7 +414,7 @@ static int dev_set_hwtstamp(struct net_device *dev, struct ifreq *ifr)
} }
if (!ops->ndo_hwtstamp_set) if (!ops->ndo_hwtstamp_set)
return dev_eth_ioctl(dev, ifr, SIOCSHWTSTAMP); /* legacy */ return -EOPNOTSUPP;
if (!netif_device_present(dev)) if (!netif_device_present(dev))
return -ENODEV; return -ENODEV;
@ -438,48 +438,23 @@ static int dev_set_hwtstamp(struct net_device *dev, struct ifreq *ifr)
return 0; return 0;
} }
static int generic_hwtstamp_ioctl_lower(struct net_device *dev, int cmd,
struct kernel_hwtstamp_config *kernel_cfg)
{
struct ifreq ifrr;
int err;
if (!kernel_cfg->ifr)
return -EINVAL;
strscpy_pad(ifrr.ifr_name, dev->name, IFNAMSIZ);
ifrr.ifr_ifru = kernel_cfg->ifr->ifr_ifru;
err = dev_eth_ioctl(dev, &ifrr, cmd);
if (err)
return err;
kernel_cfg->ifr->ifr_ifru = ifrr.ifr_ifru;
kernel_cfg->copied_to_user = true;
return 0;
}
int generic_hwtstamp_get_lower(struct net_device *dev, int generic_hwtstamp_get_lower(struct net_device *dev,
struct kernel_hwtstamp_config *kernel_cfg) struct kernel_hwtstamp_config *kernel_cfg)
{ {
const struct net_device_ops *ops = dev->netdev_ops; const struct net_device_ops *ops = dev->netdev_ops;
int err;
if (!netif_device_present(dev)) if (!netif_device_present(dev))
return -ENODEV; return -ENODEV;
if (ops->ndo_hwtstamp_get) { if (!ops->ndo_hwtstamp_get)
int err; return -EOPNOTSUPP;
netdev_lock_ops(dev); netdev_lock_ops(dev);
err = dev_get_hwtstamp_phylib(dev, kernel_cfg); err = dev_get_hwtstamp_phylib(dev, kernel_cfg);
netdev_unlock_ops(dev); netdev_unlock_ops(dev);
return err; return err;
}
/* Legacy path: unconverted lower driver */
return generic_hwtstamp_ioctl_lower(dev, SIOCGHWTSTAMP, kernel_cfg);
} }
EXPORT_SYMBOL(generic_hwtstamp_get_lower); EXPORT_SYMBOL(generic_hwtstamp_get_lower);
@ -488,22 +463,19 @@ int generic_hwtstamp_set_lower(struct net_device *dev,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
const struct net_device_ops *ops = dev->netdev_ops; const struct net_device_ops *ops = dev->netdev_ops;
int err;
if (!netif_device_present(dev)) if (!netif_device_present(dev))
return -ENODEV; return -ENODEV;
if (ops->ndo_hwtstamp_set) { if (!ops->ndo_hwtstamp_set)
int err; return -EOPNOTSUPP;
netdev_lock_ops(dev); netdev_lock_ops(dev);
err = dev_set_hwtstamp_phylib(dev, kernel_cfg, extack); err = dev_set_hwtstamp_phylib(dev, kernel_cfg, extack);
netdev_unlock_ops(dev); netdev_unlock_ops(dev);
return err; return err;
}
/* Legacy path: unconverted lower driver */
return generic_hwtstamp_ioctl_lower(dev, SIOCSHWTSTAMP, kernel_cfg);
} }
EXPORT_SYMBOL(generic_hwtstamp_set_lower); EXPORT_SYMBOL(generic_hwtstamp_set_lower);