Commit 3b0b4252 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-Clean-driver-module-and-FW-versions' 

Leon Romanovsky says:

====================
Clean driver, module and FW versions

Change log:
 v1:
  * Split all FW cleanups patches to separate patches
  * Fixed commit message
  * Deleted odd DRV_RELDATE
  * Added everyone from MAINTAINERS file
 v0: https://lore.kernel.org/netdev/20200220145855.255704-1-leon@kernel.org

This is first patchset to netdev (already sent RDMA [1] and arch/um [2])
in attempt to unify the version management for in-tree kernel code.
The patches follow already accepted ethtool change [3] to set as
a default linux kernel version.

It allows us to remove driver version and present to the users unified
picture of driver version, which is similar to default MODULE_VERSION().

As part of this series, I deleted various creative attempts to mark
absence of FW. There is no need to set "N/A" in ethtool ->fw_version
field and it is enough to do not set it.

1.
The code is compile tested and passes 0-day kbuild.
2.
The proposed changes are based on commit:
  2bb07f4e ("tc-testing: updated tdc tests for basic filter")
3.
WIP branch is [4].

[1] https://lore.kernel.org/linux-rdma/20200220071239.231800-1-leon@kernel.org/
[2] http://lists.infradead.org/pipermail/linux-um/2020-February/002913.html
[3] https://lore.kernel.org/linux-rdma/20200127072028.19123-1-leon@kernel.org/
[4] https://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git/log/?h=ethtool


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 31a57fde ea973742

drivers/net/bonding/bond_main.c

+1 −5
Original line number Diff line number Diff line
@@ -4370,7 +4370,6 @@ static void bond_ethtool_get_drvinfo(struct net_device *bond_dev, 
				     struct ethtool_drvinfo *drvinfo)

{

	strlcpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver));

	strlcpy(drvinfo->version, DRV_VERSION, sizeof(drvinfo->version));

	snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d",

		 BOND_ABI_VERSION);

}
@@ -5008,8 +5007,6 @@ static int __init bonding_init(void) 
	int i;

	int res;



	pr_info("%s", bond_version);



	res = bond_check_params(&bonding_defaults);

	if (res)

		goto out;
@@ -5064,6 +5061,5 @@ static void __exit bonding_exit(void) 
module_init(bonding_init);

module_exit(bonding_exit);

MODULE_LICENSE("GPL");

MODULE_VERSION(DRV_VERSION);

MODULE_DESCRIPTION(DRV_DESCRIPTION ", v" DRV_VERSION);

MODULE_DESCRIPTION(DRV_DESCRIPTION);

MODULE_AUTHOR("Thomas Davis, tadavis@lbl.gov and many others");

drivers/net/bonding/bonding_priv.h

+2 −3
Original line number Diff line number Diff line
@@ -14,12 +14,11 @@ 


#ifndef _BONDING_PRIV_H

#define _BONDING_PRIV_H

#include <linux/vermagic.h>



#define DRV_VERSION	"3.7.1"

#define DRV_RELDATE	"April 27, 2011"

#define DRV_NAME	"bonding"

#define DRV_DESCRIPTION	"Ethernet Channel Bonding Driver"



#define bond_version DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n"

#define bond_version DRV_DESCRIPTION ": v" UTS_RELEASE "\n"



#endif

drivers/net/dummy.c

+0 −3
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include <linux/u64_stats_sync.h>



#define DRV_NAME	"dummy"

#define DRV_VERSION	"1.0"



static int numdummies = 1;
@@ -104,7 +103,6 @@ static void dummy_get_drvinfo(struct net_device *dev, 
			      struct ethtool_drvinfo *info)

{

	strlcpy(info->driver, DRV_NAME, sizeof(info->driver));

	strlcpy(info->version, DRV_VERSION, sizeof(info->version));

}



static const struct ethtool_ops dummy_ethtool_ops = {
@@ -212,4 +210,3 @@ module_init(dummy_init_module); 
module_exit(dummy_cleanup_module);

MODULE_LICENSE("GPL");

MODULE_ALIAS_RTNL_LINK(DRV_NAME);
 
MODULE_VERSION(DRV_VERSION);

drivers/net/ethernet/3com/3c509.c

+1 −7
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ 
*/



#define DRV_NAME	"3c509"

#define DRV_VERSION	"1.20"

#define DRV_RELDATE	"04Feb2008"



/* A few values that may be tweaked. */
@@ -87,13 +85,12 @@ 
#include <linux/device.h>

#include <linux/eisa.h>

#include <linux/bitops.h>

#include <linux/vermagic.h>



#include <linux/uaccess.h>

#include <asm/io.h>

#include <asm/irq.h>



static char version[] = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";



#ifdef EL3_DEBUG

static int el3_debug = EL3_DEBUG;

#else
@@ -547,8 +544,6 @@ static int el3_common_init(struct net_device *dev) 
	       dev->name, dev->base_addr, if_names[(dev->if_port & 0x03)],

	       dev->dev_addr, dev->irq);



	if (el3_debug > 0)

		pr_info("%s", version);

	return 0;



}
@@ -1143,7 +1138,6 @@ el3_netdev_set_ecmd(struct net_device *dev, 
static void el3_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)

{

	strlcpy(info->driver, DRV_NAME, sizeof(info->driver));

	strlcpy(info->version, DRV_VERSION, sizeof(info->version));

}



static int el3_get_link_ksettings(struct net_device *dev,

drivers/net/ethernet/3com/3c515.c

+1 −15
Original line number Diff line number Diff line
@@ -22,12 +22,8 @@ 


*/



#include <linux/vermagic.h>

#define DRV_NAME		"3c515"

#define DRV_VERSION		"0.99t-ac"

#define DRV_RELDATE		"28-Oct-2002"



static char *version =

DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " becker@scyld.com and others\n";



#define CORKSCREW 1
@@ -84,7 +80,6 @@ static int max_interrupt_work = 20; 
MODULE_AUTHOR("Donald Becker <becker@scyld.com>");

MODULE_DESCRIPTION("3Com 3c515 Corkscrew driver");

MODULE_LICENSE("GPL");

MODULE_VERSION(DRV_VERSION);



/* "Knobs" for adjusting internal parameters. */

/* Put out somewhat more debugging messages. (0 - no msg, 1 minimal msgs). */
@@ -418,8 +413,6 @@ int init_module(void) 
	int found = 0;

	if (debug >= 0)

		corkscrew_debug = debug;

	if (corkscrew_debug)

		pr_debug("%s", version);

	while (corkscrew_scan(-1))

		found++;

	return found ? 0 : -ENODEV;
@@ -429,16 +422,10 @@ int init_module(void) 
struct net_device *tc515_probe(int unit)

{

	struct net_device *dev = corkscrew_scan(unit);

	static int printed;



	if (!dev)

		return ERR_PTR(-ENODEV);



	if (corkscrew_debug > 0 && !printed) {

		printed = 1;

		pr_debug("%s", version);

	}



	return dev;

}

#endif				/* not MODULE */
@@ -1540,7 +1527,6 @@ static void netdev_get_drvinfo(struct net_device *dev, 
			       struct ethtool_drvinfo *info)

{

	strlcpy(info->driver, DRV_NAME, sizeof(info->driver));

	strlcpy(info->version, DRV_VERSION, sizeof(info->version));

	snprintf(info->bus_info, sizeof(info->bus_info), "ISA 0x%lx",

		 dev->base_addr);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE