From 9179f5fe41733ff56f7dfcb83c0c1456f6d2e4ae Mon Sep 17 00:00:00 2001 From: Vladimir Oltean Date: Wed, 25 Jan 2023 13:02:14 +0200 Subject: net: ethtool: provide shims for stats aggregation helpers when CONFIG_ETHTOOL_NETLINK=n ethtool_aggregate_*_stats() are implemented in net/ethtool/stats.c, a file which is compiled out when CONFIG_ETHTOOL_NETLINK=n. In order to avoid adding Kbuild dependencies from drivers (which call these helpers) on CONFIG_ETHTOOL_NETLINK, let's add some shim definitions which simply make the helpers dead code. This means the function prototypes should have been located in include/linux/ethtool_netlink.h rather than include/linux/ethtool.h. Fixes: 449c5459641a ("net: ethtool: add helpers for aggregate statistics") Reported-by: kernel test robot Signed-off-by: Vladimir Oltean Reviewed-by: Leon Romanovsky Link: https://lore.kernel.org/r/20230125110214.4127759-1-vladimir.oltean@nxp.com Signed-off-by: Paolo Abeni --- include/linux/ethtool.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'include/linux/ethtool.h') diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index 6a8253d3fea8..515c78d8eb7c 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -991,17 +991,6 @@ int ethtool_get_phc_vclocks(struct net_device *dev, int **vclock_index); u32 ethtool_op_get_link(struct net_device *dev); int ethtool_op_get_ts_info(struct net_device *dev, struct ethtool_ts_info *eti); -void ethtool_aggregate_mac_stats(struct net_device *dev, - struct ethtool_eth_mac_stats *mac_stats); -void ethtool_aggregate_phy_stats(struct net_device *dev, - struct ethtool_eth_phy_stats *phy_stats); -void ethtool_aggregate_ctrl_stats(struct net_device *dev, - struct ethtool_eth_ctrl_stats *ctrl_stats); -void ethtool_aggregate_pause_stats(struct net_device *dev, - struct ethtool_pause_stats *pause_stats); -void ethtool_aggregate_rmon_stats(struct net_device *dev, - struct ethtool_rmon_stats *rmon_stats); - /** * ethtool_mm_frag_size_add_to_min - Translate (standard) additional fragment * size expressed as multiplier into (absolute) minimum fragment size -- cgit v1.2.3