From: Leon Romanovsky <leon@kernel.org>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Thor Thayer <thor.thayer@linux.intel.com>,
Heiko Stuebner <heiko@sntech.de>,
Igor Russkikh <irusskikh@marvell.com>,
Andreas Larsson <andreas@gaisler.com>,
Chris Snook <chris.snook@gmail.com>,
David Dillow <dave@thedillows.org>,
Jes Sorensen <jes@trained-monkey.org>,
Iyappan Subramanian <iyappan@os.amperecomputing.com>,
Quan Nguyen <quan@os.amperecomputing.com>,
linux-acenic@sunsite.dk, Andy Gospodarek <andy@greyhouse.net>,
Arthur Kiyanovski <akiyano@amazon.com>,
linux-rockchip@lists.infradead.org, Chen-Yu Tsai <wens@csie.org>,
Lino Sanfilippo <LinoSanfilippo@gmx.de>,
Veaceslav Falico <vfalico@gmail.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
Jay Cliburn <jcliburn@gmail.com>,
Jay Vosburgh <j.vosburgh@gmail.com>,
Keyur Chudgar <keyur@os.amperecomputing.com>,
Maxime Ripard <mripard@kernel.org>,
Leon Romanovsky <leonro@mellanox.com>,
Don Fry <pcnet32@frontier.com>,
nios2-dev@lists.rocketboards.org,
linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Ion Badulescu <ionut@badula.org>,
Netanel Belgazal <netanel@amazon.com>,
Mark Einon <mark.einon@gmail.com>
Subject: [PATCH net-next v1 01/18] net/bond: Delete driver and module versions
Date: Mon, 24 Feb 2020 10:52:54 +0200 [thread overview]
Message-ID: <20200224085311.460338-2-leon@kernel.org> (raw)
In-Reply-To: <20200224085311.460338-1-leon@kernel.org>
From: Leon Romanovsky <leonro@mellanox.com>
The in-kernel code has already unique version, which is based
on Linus's tag, update the bond driver to be consistent with that
version.
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
drivers/net/bonding/bond_main.c | 6 +-----
drivers/net/bonding/bonding_priv.h | 5 ++---
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index c68c1d1387ee..2e70e43c5df5 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -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");
diff --git a/drivers/net/bonding/bonding_priv.h b/drivers/net/bonding/bonding_priv.h
index 5a4d81a9437c..45b77bc8c7b3 100644
--- a/drivers/net/bonding/bonding_priv.h
+++ b/drivers/net/bonding/bonding_priv.h
@@ -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
--
2.24.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-02-24 8:54 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-24 8:52 [PATCH net-next v1 00/18] Clean driver, module and FW versions Leon Romanovsky
2020-02-24 8:52 ` Leon Romanovsky [this message]
2020-02-24 8:52 ` [PATCH net-next v1 02/18] net/dummy: Ditch driver and module versions Leon Romanovsky
2020-02-24 8:52 ` [PATCH net-next v1 03/18] net/3com: Delete driver and module versions from 3com drivers Leon Romanovsky
2020-04-11 15:56 ` [PATCH] net/3com/3c515: Fix MODULE_ARCH_VERMAGIC redefinition Borislav Petkov
2020-04-11 16:11 ` Leon Romanovsky
2020-04-11 17:35 ` Borislav Petkov
2020-04-11 18:10 ` Leon Romanovsky
2020-04-11 18:41 ` Borislav Petkov
2020-04-13 4:03 ` David Miller
2020-04-13 4:55 ` Leon Romanovsky
2020-04-13 5:07 ` David Miller
2020-04-13 5:26 ` Leon Romanovsky
2020-04-13 5:36 ` David Miller
2020-04-13 8:04 ` Borislav Petkov
2020-04-13 8:40 ` Leon Romanovsky
2020-04-14 12:23 ` Leon Romanovsky
2020-02-24 8:52 ` [PATCH net-next v1 04/18] net/adaptec: Clean driver versions Leon Romanovsky
2020-02-24 8:52 ` [PATCH net-next v1 05/18] net/aeroflex: Clean ethtool_info struct assignments Leon Romanovsky
2020-02-24 8:52 ` [PATCH net-next v1 06/18] net/aeroflex: Don't assign FW if it is not available Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 07/18] net/agere: Delete unneeded driver version Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 08/18] net/alacritech: Delete " Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 09/18] net/allwinner: Remove " Leon Romanovsky
2020-02-24 9:43 ` Maxime Ripard
2020-02-24 8:53 ` [PATCH net-next v1 10/18] net/alteon: Properly report FW version Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 11/18] net/althera: Delete hardcoded driver version Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 12/18] net/amazon: Ensure that driver version is aligned to the linux kernel Leon Romanovsky
2020-02-24 9:03 ` Kiyanovski, Arthur
2020-02-24 9:41 ` Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 13/18] net/amd: Remove useless driver version Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 14/18] net/apm: " Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 15/18] net/apm: Properly mark absence of FW Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 16/18] net/aquantia: Delete module version Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 17/18] net/arc: Delete driver version Leon Romanovsky
2020-02-24 8:53 ` [PATCH net-next v1 18/18] net/atheros: Clean atheros code from " Leon Romanovsky
2020-02-24 18:15 ` Chris Snook
2020-02-24 19:49 ` [PATCH net-next v1 00/18] Clean driver, module and FW versions David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200224085311.460338-2-leon@kernel.org \
--to=leon@kernel.org \
--cc=LinoSanfilippo@gmx.de \
--cc=akiyano@amazon.com \
--cc=andreas@gaisler.com \
--cc=andy@greyhouse.net \
--cc=chris.snook@gmail.com \
--cc=dave@thedillows.org \
--cc=davem@davemloft.net \
--cc=heiko@sntech.de \
--cc=ionut@badula.org \
--cc=irusskikh@marvell.com \
--cc=iyappan@os.amperecomputing.com \
--cc=j.vosburgh@gmail.com \
--cc=jcliburn@gmail.com \
--cc=jes@trained-monkey.org \
--cc=keyur@os.amperecomputing.com \
--cc=kuba@kernel.org \
--cc=leonro@mellanox.com \
--cc=linux-acenic@sunsite.dk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mark.einon@gmail.com \
--cc=mripard@kernel.org \
--cc=netanel@amazon.com \
--cc=netdev@vger.kernel.org \
--cc=nios2-dev@lists.rocketboards.org \
--cc=pcnet32@frontier.com \
--cc=quan@os.amperecomputing.com \
--cc=thomas.lendacky@amd.com \
--cc=thor.thayer@linux.intel.com \
--cc=vfalico@gmail.com \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).