Patch "i40e: only register client on iWarp-capable devices" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
i40e: only register client on iWarp-capable devices
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
i40e-only-register-client-on-iwarp-capable-devices.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Sun Mar 18 16:55:33 CET 2018
From: Mitch Williams <[email protected]>
Date: Tue, 4 Apr 2017 12:40:16 -0700
Subject: i40e: only register client on iWarp-capable devices
From: Mitch Williams <[email protected]>
[ Upstream commit 004eb614c4d2fcc12a98714fd887a860582f203a ]
The client interface is only intended for use on devices that support iWarp. Only register with the client if this is the case.
This fixes a panic when loading i40iw on X710 devices.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +11 -8
@@ -11142,10 +11142,12 @@ static int i40e_probe(struct pci_dev *pd round_jiffies(jiffies + pf->service_timer_period));/* add this PF to client device list and launch a client service task */ - err =i40e_lan_add_device (pf); -if (err) -dev_info (&pdev->dev,"Failed to add PF to client API service list: %d\n" , - err); +if (pf->flags &I40E_FLAG_IWARP_ENABLED ) { + err =i40e_lan_add_device (pf); +if (err) +dev_info (&pdev->dev,"Failed to add PF to client API service list: %d\n" , + err); + }#ifdef I40E_FCOE /* create FCoE interface */
@@ -11323,10 +11325,11 @@ static void i40e_remove(struct pci_dev *i40e_vsi_release (pf->vsi[pf->lan_vsi]);/* remove attached clients */ - ret_code =i40e_lan_del_device (pf); -if (ret_code) { -dev_warn (&pdev->dev,"Failed to delete client device: %d\n" , - ret_code); +if (pf->flags &I40E_FLAG_IWARP_ENABLED ) { + ret_code =i40e_lan_del_device (pf); +if (ret_code) +dev_warn (&pdev->dev,"Failed to delete client device: %d\n" , + ret_code); }/* shutdown and destroy the HMC */
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/i40e-only-register-client-on-iwarp-capable-devices.patch