Commit d2efeb52 authored by Jann Horn's avatar Jann Horn Committed by Jakub Kicinski
Browse files

net: ethtool: avoid rebuilds on UTS_RELEASE change 



Currently, when you switch between branches or something like that and
rebuild, net/ethtool/ioctl.c has to be built again because it depends
on UTS_RELEASE.

By instead referencing a string variable stored in another object file,
this can be avoided.

Signed-off-by: default avatarJann Horn <jannh@google.com>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20240220194244.2056384-1-jannh@google.com


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

net/ethtool/ioctl.c

+3 −2
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ 
#include <linux/sched/signal.h>

#include <linux/net.h>

#include <linux/pm_runtime.h>

#include <linux/utsname.h>

#include <net/devlink.h>

#include <net/ipv6.h>

#include <net/xdp_sock_drv.h>

#include <net/flow_offload.h>

#include <linux/ethtool_netlink.h>

#include <generated/utsrelease.h>

#include "common.h"



/* State held across locks and calls for commands which have devlink fallback */
@@ -713,7 +713,8 @@ ethtool_get_drvinfo(struct net_device *dev, struct ethtool_devlink_compat *rsp) 
	struct device *parent = dev->dev.parent;



	rsp->info.cmd = ETHTOOL_GDRVINFO;

	strscpy(rsp->info.version, UTS_RELEASE, sizeof(rsp->info.version));

	strscpy(rsp->info.version, init_uts_ns.name.release,

		sizeof(rsp->info.version));

	if (ops->get_drvinfo) {

		ops->get_drvinfo(dev, &rsp->info);

		if (!rsp->info.bus_info[0] && parent)