mirror of
https://github.com/torvalds/linux.git
synced 2026-05-25 15:41:52 +02:00
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>
This commit is contained in:
commit
5c4e0f3ae4
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user