diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-02-24 05:04:15 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-02-24 05:04:15 +0300 |
| commit | 5c4e0f3ae45e82fa125c5a9c7c25e7df9a6b98ec (patch) | |
| tree | bcca459841db9623de7d2a742adbfc17353ef696 | |
| parent | 3e596599372e7823d08c658fde85bfc8bae9ba83 (diff) | |
| parent | 0a4e1b453a8aee4a0942b6a0b55ffe0c87956cba (diff) | |
| download | linux-5c4e0f3ae45e82fa125c5a9c7c25e7df9a6b98ec.tar.xz | |
Merge branch 'net-staging-don-t-bother-filling-in-ethtool-driver-version'
John Garry says:
====================
net: Don't bother filling in ethtool driver version
The drivers included in this series set the ethtool driver version to the
same as the default, UTS_RELEASE, so don't both doing this.
As noted by Masahiro in [0], with CONFIG_MODVERSIONS=y, some drivers could
be built as modules against a different kernel tree with differing
UTS_RELEASE. As such, these changes could lead to a change in behaviour.
However, defaulting to the core kernel UTS_RELEASE would be expected
behaviour.
[0] https://lore.kernel.org/all/CAK7LNASfTW+OMk1cJJWb4E6P+=k0FEsm_=6FDfDF_mTrxJCSMQ@mail.gmail.com/
====================
Link: https://lore.kernel.org/r/20240222090042.12609-1-john.g.garry@oracle.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | drivers/net/ethernet/rocker/rocker_main.c | 2 | ||||
| -rw-r--r-- | drivers/net/team/team.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c index 9e59669a93dd..755db89db909 100644 --- a/drivers/net/ethernet/rocker/rocker_main.c +++ b/drivers/net/ethernet/rocker/rocker_main.c @@ -32,7 +32,6 @@ #include <net/fib_rules.h> #include <net/fib_notifier.h> #include <linux/io-64-nonatomic-lo-hi.h> -#include <generated/utsrelease.h> #include "rocker_hw.h" #include "rocker.h" @@ -2227,7 +2226,6 @@ static void rocker_port_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo) { strscpy(drvinfo->driver, rocker_driver_name, sizeof(drvinfo->driver)); - strscpy(drvinfo->version, UTS_RELEASE, sizeof(drvinfo->version)); } static struct rocker_port_stats { diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index f575f225d417..0a44bbdcfb7b 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -25,7 +25,6 @@ #include <net/genetlink.h> #include <net/netlink.h> #include <net/sch_generic.h> -#include <generated/utsrelease.h> #include <linux/if_team.h> #define DRV_NAME "team" @@ -2074,7 +2073,6 @@ static void team_ethtool_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo) { strscpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver)); - strscpy(drvinfo->version, UTS_RELEASE, sizeof(drvinfo->version)); } static int team_ethtool_get_link_ksettings(struct net_device *dev, |