Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeffceee authored by Mark Rustad's avatar Mark Rustad Committed by Jeff Kirsher
Browse files

ixgbevf: Handle previously-freed msix_entries 



The msix_entries memory can be freed by a previous suspend or
remove, so don't crash on close when it isn't there. Also only
clear the interrupts when the interface is up, because there
aren't any when it is not up.

Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 9f3c7504

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+7 −2
Original line number Diff line number Diff line
@@ -1498,6 +1498,9 @@ static void ixgbevf_free_irq(struct ixgbevf_adapter *adapter) 
{

	int i, q_vectors;



	if (!adapter->msix_entries)

		return;



	q_vectors = adapter->num_msix_vectors;

	i = q_vectors - 1;
@@ -2552,6 +2555,9 @@ static void ixgbevf_free_q_vectors(struct ixgbevf_adapter *adapter) 
 **/

static void ixgbevf_reset_interrupt_capability(struct ixgbevf_adapter *adapter)

{

	if (!adapter->msix_entries)

		return;



	pci_disable_msix(adapter->pdev);

	kfree(adapter->msix_entries);

	adapter->msix_entries = NULL;
@@ -3794,11 +3800,10 @@ static int ixgbevf_suspend(struct pci_dev *pdev, pm_message_t state) 
		ixgbevf_free_irq(adapter);

		ixgbevf_free_all_tx_resources(adapter);

		ixgbevf_free_all_rx_resources(adapter);

		ixgbevf_clear_interrupt_scheme(adapter);

		rtnl_unlock();

	}



	ixgbevf_clear_interrupt_scheme(adapter);



#ifdef CONFIG_PM

	retval = pci_save_state(pdev);

	if (retval)