Commit 30b35600 authored Jul 15, 2024 by Jakub Kicinski

Merge branch 'net-make-timestamping-selectable'

First part of "net: Make timestamping selectable" from Kory Maincent.
Change the driver-facing type already to lower rebasing pain.

Link: https://lore.kernel.org/20240709-feature_ptp_netnext-v17-0-b5317f50df2a@bootlin.com/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents 9283477e 2111375b

drivers/net/bonding/bond_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -5755,10 +5755,10 @@ static void bond_ethtool_get_drvinfo(struct net_device *bond_dev,
		}

		static int bond_ethtool_get_ts_info(struct net_device *bond_dev,
		struct ethtool_ts_info *info)
		struct kernel_ethtool_ts_info *info)
		{
		struct bonding *bond = netdev_priv(bond_dev);
		struct ethtool_ts_info ts_info;
		struct kernel_ethtool_ts_info ts_info;
		struct net_device *real_dev;
		bool sw_tx_support = false;
		struct list_head *iter;

drivers/net/can/dev/dev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -376,7 +376,7 @@ EXPORT_SYMBOL(can_eth_ioctl_hwts);
		* supporting hardware timestamps
		*/
		int can_ethtool_op_get_ts_info_hwts(struct net_device *dev,
		struct ethtool_ts_info *info)
		struct kernel_ethtool_ts_info *info)
		{
		info->so_timestamping =
		SOF_TIMESTAMPING_TX_SOFTWARE \|

drivers/net/can/peak_canfd/peak_canfd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -777,7 +777,7 @@ static const struct net_device_ops peak_canfd_netdev_ops = {
		};

		static int peak_get_ts_info(struct net_device *dev,
		struct ethtool_ts_info *info)
		struct kernel_ethtool_ts_info *info)
		{
		info->so_timestamping =
		SOF_TIMESTAMPING_TX_SOFTWARE \|

drivers/net/can/usb/gs_usb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1148,7 +1148,7 @@ static int gs_usb_set_phys_id(struct net_device *netdev,
		}

		static int gs_usb_get_ts_info(struct net_device *netdev,
		struct ethtool_ts_info *info)
		struct kernel_ethtool_ts_info *info)
		{
		struct gs_can *dev = netdev_priv(netdev);

drivers/net/can/usb/peak_usb/pcan_usb_core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -897,7 +897,7 @@ int peak_usb_set_eeprom(struct net_device *netdev,
		return 0;
		}

		int pcan_get_ts_info(struct net_device dev, struct ethtool_ts_info info)
		int pcan_get_ts_info(struct net_device dev, struct kernel_ethtool_ts_info info)
		{
		info->so_timestamping =
		SOF_TIMESTAMPING_TX_SOFTWARE \|