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

Commit 2b1588c3 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: Fix a memory leak in IEEE DCB 



The driver was freeing memory in shutdown instead of remove.  As a result
we were leaking memory if IEEE DCB was enabled and we loaded/unloaded the
driver.  This change moves the freeing of the memory into the remove
routine where it belongs.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Acked-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Tested-by: default avatarRoss Brattain <ross.b.brattain@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 9bd1be45

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+5 −4
Original line number Diff line number Diff line
@@ -4873,10 +4873,6 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake) 
	}



	ixgbe_clear_interrupt_scheme(adapter);

#ifdef CONFIG_DCB

	kfree(adapter->ixgbe_ieee_pfc);

	kfree(adapter->ixgbe_ieee_ets);

#endif



#ifdef CONFIG_PM

	retval = pci_save_state(pdev);
@@ -7224,6 +7220,11 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev) 


	ixgbe_release_hw_control(adapter);



#ifdef CONFIG_DCB

	kfree(adapter->ixgbe_ieee_pfc);

	kfree(adapter->ixgbe_ieee_ets);



#endif

	iounmap(adapter->hw.hw_addr);

	pci_release_selected_regions(pdev, pci_select_bars(pdev,

				     IORESOURCE_MEM));