net/nfp: Update driver to use global kernel version
Change nfp driver to use globally defined kernel version. Reported-by: Borislav Petkov <bp@suse.de> Acked-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Leon Romanovsky <leonro@mellanox.com> Reviewed-by: Simon Horman <simon.horman@netronome.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
cad99e5068
Коммит
b4f3721981
drivers/net/ethernet/netronome/nfp
|
@ -14,7 +14,6 @@
|
||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
#include <linux/pci.h>
|
#include <linux/pci.h>
|
||||||
#include <linux/firmware.h>
|
#include <linux/firmware.h>
|
||||||
#include <linux/vermagic.h>
|
|
||||||
#include <linux/vmalloc.h>
|
#include <linux/vmalloc.h>
|
||||||
#include <net/devlink.h>
|
#include <net/devlink.h>
|
||||||
|
|
||||||
|
@ -31,7 +30,6 @@
|
||||||
#include "nfp_net.h"
|
#include "nfp_net.h"
|
||||||
|
|
||||||
static const char nfp_driver_name[] = "nfp";
|
static const char nfp_driver_name[] = "nfp";
|
||||||
const char nfp_driver_version[] = VERMAGIC_STRING;
|
|
||||||
|
|
||||||
static const struct pci_device_id nfp_pci_device_ids[] = {
|
static const struct pci_device_id nfp_pci_device_ids[] = {
|
||||||
{ PCI_VENDOR_ID_NETRONOME, PCI_DEVICE_ID_NETRONOME_NFP6000,
|
{ 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_AUTHOR("Netronome Systems <oss-drivers@netronome.com>");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
MODULE_DESCRIPTION("The Netronome Flow Processor (NFP) driver.");
|
MODULE_DESCRIPTION("The Netronome Flow Processor (NFP) driver.");
|
||||||
MODULE_VERSION(UTS_RELEASE);
|
|
||||||
|
|
|
@ -203,8 +203,6 @@ nfp_get_drvinfo(struct nfp_app *app, struct pci_dev *pdev,
|
||||||
char nsp_version[ETHTOOL_FWVERS_LEN] = {};
|
char nsp_version[ETHTOOL_FWVERS_LEN] = {};
|
||||||
|
|
||||||
strlcpy(drvinfo->driver, pdev->driver->name, sizeof(drvinfo->driver));
|
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);
|
nfp_net_get_nspinfo(app, nsp_version);
|
||||||
snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
|
snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
|
||||||
"%s %s %s %s", vnic_version, nsp_version,
|
"%s %s %s %s", vnic_version, nsp_version,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче