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

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
40GbE Intel Wired LAN Driver Updates 2020-06-25

This series contains updates to i40e driver and removes the individual
driver versions from all of the Intel wired LAN drivers.

Shiraz moves the client header so that it can easily be shared between
the i40e LAN driver and i40iw RDMA driver.

Jesse cleans up the unused defines, since they are just dead weight.

Alek reduces the unreasonably long wait time for a PF reset after reboot
by using jiffies to limit the maximum wait time for the PF reset to
succeed.  Added additional logging to let the user know when the driver
transitions into recovery mode.  Adds new device support for our 5 Gbps
NICs.

Todd adds a check to see if MFS is set after warm reboot and notifies
the user when MFS is set to anything lower than the default value.

Arkadiusz fixes a possible race condition, where were holding a
spin-lock while in atomic context.

v2: removed code comments that were no longer applicable in patch 2 of
    the series.  Also removed 'inline' from patch 4 and patch 8 of the
    series.  Also re-arranged code to be able to remove the forward
    function declarations.  Dropped patch 9 of the series, while the
    author works on cleaning up the commit message.
v3: Updated patch 8 description to answer Jakub's questions
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 18c955b7 37d318d7

drivers/infiniband/hw/i40iw/Makefile

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

ccflags-y :=  -I $(srctree)/drivers/net/ethernet/intel/i40e



obj-$(CONFIG_INFINIBAND_I40IW) += i40iw.o

drivers/infiniband/hw/i40iw/i40iw.h

+1 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <linux/slab.h>

#include <linux/io.h>

#include <linux/crc32c.h>

#include <linux/net/intel/i40e_client.h>

#include <rdma/ib_smi.h>

#include <rdma/ib_verbs.h>

#include <rdma/ib_pack.h>
@@ -57,7 +58,6 @@ 
#include "i40iw_d.h"

#include "i40iw_hmc.h"



#include <i40e_client.h>

#include "i40iw_type.h"

#include "i40iw_p.h"

#include <rdma/i40iw-abi.h>

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));

CRA Git | Maintained and supported by SUSTech CRA and CCSE