Commit efb45930 authored by Kory Maincent's avatar Kory Maincent Committed by Jakub Kicinski
Browse files

net: Move dev_set_hwtstamp_phylib to net/core/dev.h 



This declaration was added to the header to be called from ethtool.
ethtool is separated from core for code organization but it is not really
a separate entity, it controls very core things.
As ethtool is an internal stuff it is not wise to have it in netdevice.h.
Move the declaration to net/core/dev.h instead.

Remove the EXPORT_SYMBOL_GPL call as ethtool can not be built as a module.

Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarKory Maincent <kory.maincent@bootlin.com>
Link: https://lore.kernel.org/r/20240612-feature_ptp_netnext-v15-2-b2a086257b63@bootlin.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 0d9bb144

include/linux/netdevice.h

+0 −3
Original line number Diff line number Diff line
@@ -3904,9 +3904,6 @@ int generic_hwtstamp_get_lower(struct net_device *dev, 
int generic_hwtstamp_set_lower(struct net_device *dev,

			       struct kernel_hwtstamp_config *kernel_cfg,

			       struct netlink_ext_ack *extack);

int dev_set_hwtstamp_phylib(struct net_device *dev,

			    struct kernel_hwtstamp_config *cfg,

			    struct netlink_ext_ack *extack);

int dev_ethtool(struct net *net, struct ifreq *ifr, void __user *userdata);

unsigned int dev_get_flags(const struct net_device *);

int __dev_change_flags(struct net_device *dev, unsigned int flags,

net/core/dev.h

+4 −0
Original line number Diff line number Diff line
@@ -166,4 +166,8 @@ static inline void dev_xmit_recursion_dec(void) 
	__this_cpu_dec(softnet_data.xmit.recursion);

}



int dev_set_hwtstamp_phylib(struct net_device *dev,

			    struct kernel_hwtstamp_config *cfg,

			    struct netlink_ext_ack *extack);



#endif

net/core/dev_ioctl.c

+0 −1
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ int dev_set_hwtstamp_phylib(struct net_device *dev, 


	return 0;

}

EXPORT_SYMBOL_GPL(dev_set_hwtstamp_phylib);



static int dev_set_hwtstamp(struct net_device *dev, struct ifreq *ifr)

{