Commit 34a2a3b8 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

net/intel: remove driver versions from Intel drivers 



As with other networking drivers, remove the unnecessary driver version
from the Intel drivers. The ethtool driver information and module version
will then report the kernel version instead.

For ixgbe, i40e and ice drivers, the driver passes the driver version to
the firmware to confirm that we are up and running.  So we now pass the
value of UTS_RELEASE to the firmware.  This adminq call is required per
the HAS document.  The Device then sends an indication to the BMC that the
PF driver is present. This is done using Host NC Driver Status Indication
in NC-SI Get Link command or via the Host Network Controller Driver Status
Change AEN.

What the BMC may do with this information is implementation-dependent, but
this is a standard NC-SI 1.1 command we honor per the HAS.

CC: Bruce Allan <bruce.w.allan@intel.com>
CC: Jesse Brandeburg <jesse.brandeburg@intel.com>
CC: Alek Loktionov <aleksandr.loktionov@intel.com>
CC: Kevin Liedtke <kevin.d.liedtke@intel.com>
CC: Aaron Rowden <aaron.f.rowden@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Co-developed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
parent 3a2c6ced

drivers/net/ethernet/intel/e100.c

+1 −5
Original line number Diff line number Diff line
@@ -150,8 +150,6 @@ 




#define DRV_NAME		"e100"

#define DRV_EXT			"-NAPI"

#define DRV_VERSION		"3.5.24-k2"DRV_EXT

#define DRV_DESCRIPTION		"Intel(R) PRO/100 Network Driver"

#define DRV_COPYRIGHT		"Copyright(c) 1999-2006 Intel Corporation"
@@ -165,7 +163,6 @@ 
MODULE_DESCRIPTION(DRV_DESCRIPTION);

MODULE_AUTHOR(DRV_COPYRIGHT);

MODULE_LICENSE("GPL v2");

MODULE_VERSION(DRV_VERSION);

MODULE_FIRMWARE(FIRMWARE_D101M);

MODULE_FIRMWARE(FIRMWARE_D101S);

MODULE_FIRMWARE(FIRMWARE_D102E);
@@ -2430,7 +2427,6 @@ static void e100_get_drvinfo(struct net_device *netdev, 
{

	struct nic *nic = netdev_priv(netdev);

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

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

	strlcpy(info->bus_info, pci_name(nic->pdev),

		sizeof(info->bus_info));

}
@@ -3167,7 +3163,7 @@ static struct pci_driver e100_driver = { 
static int __init e100_init_module(void)

{

	if (((1 << debug) - 1) & NETIF_MSG_DRV) {

		pr_info("%s, %s\n", DRV_DESCRIPTION, DRV_VERSION);

		pr_info("%s\n", DRV_DESCRIPTION);

		pr_info("%s\n", DRV_COPYRIGHT);

	}

	return pci_register_driver(&e100_driver);

drivers/net/ethernet/intel/e1000/e1000.h

+0 −1
Original line number Diff line number Diff line
@@ -330,7 +330,6 @@ struct net_device *e1000_get_hw_dev(struct e1000_hw *hw); 
	dev_err(&adapter->pdev->dev, format, ## arg)



extern char e1000_driver_name[];

extern const char e1000_driver_version[];



int e1000_open(struct net_device *netdev);

int e1000_close(struct net_device *netdev);

drivers/net/ethernet/intel/e1000/e1000_ethtool.c

+0 −2
Original line number Diff line number Diff line
@@ -533,8 +533,6 @@ static void e1000_get_drvinfo(struct net_device *netdev, 


	strlcpy(drvinfo->driver,  e1000_driver_name,

		sizeof(drvinfo->driver));

	strlcpy(drvinfo->version, e1000_driver_version,

		sizeof(drvinfo->version));



	strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),

		sizeof(drvinfo->bus_info));

drivers/net/ethernet/intel/e1000/e1000_main.c

+1 −4
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 


char e1000_driver_name[] = "e1000";

static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";

#define DRV_VERSION "7.3.21-k8-NAPI"

const char e1000_driver_version[] = DRV_VERSION;

static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";



/* e1000_pci_tbl - PCI Device ID Table
@@ -194,7 +192,6 @@ static struct pci_driver e1000_driver = { 
MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");

MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");

MODULE_LICENSE("GPL v2");

MODULE_VERSION(DRV_VERSION);



#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK)

static int debug = -1;
@@ -221,7 +218,7 @@ struct net_device *e1000_get_hw_dev(struct e1000_hw *hw) 
static int __init e1000_init_module(void)

{

	int ret;

	pr_info("%s - version %s\n", e1000_driver_string, e1000_driver_version);

	pr_info("%s\n", e1000_driver_string);



	pr_info("%s\n", e1000_copyright);

drivers/net/ethernet/intel/e1000e/e1000.h

+0 −1
Original line number Diff line number Diff line
@@ -460,7 +460,6 @@ enum latency_range { 
};



extern char e1000e_driver_name[];

extern const char e1000e_driver_version[];



void e1000e_check_options(struct e1000_adapter *adapter);

void e1000e_set_ethtool_ops(struct net_device *netdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE