From patchwork Mon Apr 22 12:50:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kory Maincent X-Patchwork-Id: 13638495 X-Patchwork-Delegate: kuba@kernel.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 55B49149C6C; Mon, 22 Apr 2024 12:50:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713790246; cv=none; b=gZDLBSsQ7T8SygPRAGA8z2jA+o4pv2eL8jEdF/Lk4QBN4axKF0KWdE/7dwkg682Qs6O7P+oRGMM2NkNw1EaQN2OLzn6K2CcPnqL0rhKpvNHOjbEOwSo2mzTdniRM5I3QK1fqvYFRCl6vPqRXJCh+cZcF7mxe0iWoiAfj8iIUB6w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713790246; c=relaxed/simple; bh=vSo2MhDNU+CDCIrFfgeujlPMwPugHqNwJkki1BSv5aI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Oi8c3nYNqWHaNH8oInHq5fOHC3EOxa3ct6uyB3WCHPwFethPUBDOT2j5GsrrAkucaGm/HfeIaq/3SvvX+Sj1aWQ/bj+SwyvqDD8O9KyDudugcY7J7I51sIJ8Tqct27YcIUS5q6DATbciepiGwJN5jBW/YQpsx5NoINdkIV1a+2Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=AVOrGcfd; arc=none smtp.client-ip=217.70.183.196 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="AVOrGcfd" Received: by mail.gandi.net (Postfix) with ESMTPSA id D9500E000B; Mon, 22 Apr 2024 12:50:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1713790237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=69VcxahaHqB44axL5H++y4Y3vFqO2o/VIvQEAUhB8ZE=; b=AVOrGcfdSmP1Ixn9rrBY45gMGeRyve0/1ubuJux1U3tiBIdixKqgSCRbysqsRtIYEt1UZp NATrm43ZFinp3WmDgByIgnHaDP85rmIOOM3Z7ga9kwu1WE1r3B/6cmgTADbwkBxO5WMiM7 BcSk+SdQWLonP4Q/NKY9eyApmyobEa/y9TmA6LydK9czGwfctzw39qkgjCeDBHwOM7DPN7 RbIB+ysryD1qcZ//1nxAMK3SLgIosU9/xpbjVPJ/BRczR9fTQgTLqWVHXoextdteRwiEPE KypkM1YlB9G0Do9UA7TcfewnmbKcumEIb56so2GNYM3Arcduwdr3FlqzQ7vTPg== From: Kory Maincent Date: Mon, 22 Apr 2024 14:50:17 +0200 Subject: [PATCH net-next v11 02/13] net: Move dev_set_hwtstamp_phylib to net/core/dev.h Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240422-feature_ptp_netnext-v11-2-f14441f2a1d8@bootlin.com> References: <20240422-feature_ptp_netnext-v11-0-f14441f2a1d8@bootlin.com> In-Reply-To: <20240422-feature_ptp_netnext-v11-0-f14441f2a1d8@bootlin.com> To: Florian Fainelli , Broadcom internal kernel review list , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Radu Pirea , Jay Vosburgh , Andy Gospodarek , Nicolas Ferre , Claudiu Beznea , Willem de Bruijn , Jonathan Corbet , Horatiu Vultur , UNGLinuxDriver@microchip.com, Simon Horman , Vladimir Oltean Cc: Thomas Petazzoni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Maxime Chevallier , Rahul Rameshbabu , Kory Maincent , Willem de Bruijn X-Mailer: b4 0.13.0 X-GND-Sasl: kory.maincent@bootlin.com X-Patchwork-Delegate: kuba@kernel.org 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: Willem de Bruijn Signed-off-by: Kory Maincent --- Change in v10: - New patch. --- include/linux/netdevice.h | 3 --- net/core/dev.h | 4 ++++ net/core/dev_ioctl.c | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index d45f330d083d..9a4b92b49fac 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3901,9 +3901,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, diff --git a/net/core/dev.h b/net/core/dev.h index 8572d2c8dc4a..39819fffece7 100644 --- a/net/core/dev.h +++ b/net/core/dev.h @@ -167,4 +167,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 diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c index 9a66cf5015f2..b9719ed3c3fd 100644 --- a/net/core/dev_ioctl.c +++ b/net/core/dev_ioctl.c @@ -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) {