From: Jakub Kicinski Date: Mon, 15 Jul 2024 14:13:00 +0000 (-0700) Subject: Merge branch 'net-make-timestamping-selectable' X-Git-Tag: v6.11-rc1~163^2~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30b3560050486275c6207c8c90c0d53a7cc73ac1;p=thirdparty%2Fkernel%2Flinux.git 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 --- 30b3560050486275c6207c8c90c0d53a7cc73ac1 diff --cc net/ethtool/common.h index b55705a9ad5aa,b9daeecbd84df..863806fcf01ae --- a/net/ethtool/common.h +++ b/net/ethtool/common.h @@@ -42,9 -42,9 +42,9 @@@ int __ethtool_get_link(struct net_devic bool convert_legacy_settings_to_link_ksettings( struct ethtool_link_ksettings *link_ksettings, const struct ethtool_cmd *legacy_settings); -int ethtool_get_max_rxfh_channel(struct net_device *dev, u32 *max); +u32 ethtool_get_max_rxfh_channel(struct net_device *dev); int ethtool_get_max_rxnfc_channel(struct net_device *dev, u64 *max); - int __ethtool_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info); + int __ethtool_get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *info); extern const struct ethtool_phy_ops *ethtool_phy_ops; extern const struct ethtool_pse_ops *ethtool_pse_ops;