From: Leon Romanovsky <leon@kernel.org>
To: "David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Leon Romanovsky <leonro@mellanox.com>,
Borislav Petkov <bp@suse.de>,
netdev@vger.kernel.org, oss-drivers@netronome.com
Subject: [PATCH net-next 3/4] net/nfp: Update driver to use global kernel version
Date: Tue, 14 Apr 2020 18:57:31 +0300 [thread overview]
Message-ID: <20200414155732.1236944-4-leon@kernel.org> (raw)
In-Reply-To: <20200414155732.1236944-1-leon@kernel.org>
From: Leon Romanovsky <leonro@mellanox.com>
Change nfp driver to use globally defined kernel version.
Reported-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
drivers/net/ethernet/netronome/nfp/nfp_main.c | 3 ---
drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 --
2 files changed, 5 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_main.c b/drivers/net/ethernet/netronome/nfp/nfp_main.c
index 4d282fc56009..7ff2ccbd43b0 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_main.c
@@ -14,7 +14,6 @@
#include <linux/mutex.h>
#include <linux/pci.h>
#include <linux/firmware.h>
-#include <linux/vermagic.h>
#include <linux/vmalloc.h>
#include <net/devlink.h>
@@ -31,7 +30,6 @@
#include "nfp_net.h"
static const char nfp_driver_name[] = "nfp";
-const char nfp_driver_version[] = VERMAGIC_STRING;
static const struct pci_device_id nfp_pci_device_ids[] = {
{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP6000,
@@ -920,4 +918,3 @@ MODULE_FIRMWARE("netronome/nic_AMDA0099-0001_1x10_1x25.nffw");
MODULE_AUTHOR("Netronome Systems <oss-drivers@netronome.com>");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("The Netronome Flow Processor (NFP) driver.");
-MODULE_VERSION(UTS_RELEASE);
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
index 2779f1526d1e..a5aa3219d112 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
@@ -203,8 +203,6 @@ nfp_get_drvinfo(struct nfp_app *app, struct pci_dev *pdev,
char nsp_version[ETHTOOL_FWVERS_LEN] = {};
strlcpy(drvinfo->driver, pdev->driver->name, sizeof(drvinfo->driver));
- strlcpy(drvinfo->version, nfp_driver_version, sizeof(drvinfo->version));
-
nfp_net_get_nspinfo(app, nsp_version);
snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
"%s %s %s %s", vnic_version, nsp_version,
--
2.25.2
next prev parent reply other threads:[~2020-04-14 15:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-14 15:57 [PATCH net-next 0/4] Remove vermagic header from global include folder Leon Romanovsky
2020-04-14 15:57 ` [PATCH net-next 1/4] drivers: Remove inclusion of vermagic header Leon Romanovsky
2020-04-14 16:00 ` Borislav Petkov
2020-04-14 17:26 ` Leon Romanovsky
2020-04-14 17:44 ` Borislav Petkov
2020-04-14 17:54 ` Leon Romanovsky
2020-04-14 17:07 ` Sebastian Reichel
2020-04-14 17:32 ` Shannon Nelson
2020-04-14 17:45 ` Borislav Petkov
2020-04-14 15:57 ` [PATCH net-next 2/4] net/hns: Remove custom driver version in favour of global one Leon Romanovsky
2020-04-14 15:57 ` Leon Romanovsky [this message]
2020-04-14 20:37 ` [PATCH net-next 3/4] net/nfp: Update driver to use global kernel version Jakub Kicinski
[not found] ` <20200414155732.1236944-5-leon@kernel.org>
[not found] ` <20200414160349.GH31763@zn.tnic>
2020-04-14 18:41 ` [PATCH net-next 4/4] kernel/module: Hide vermagic header file from general use Leon Romanovsky
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=20200414155732.1236944-4-leon@kernel.org \
--to=leon@kernel.org \
--cc=bp@suse.de \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=leonro@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.com \
/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).