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

Commit fa378134 authored by Andy Gospodarek's avatar Andy Gospodarek Committed by David S. Miller
Browse files

ixgbe: fix panic when shutting down system with WoL enabled 



This patch added to 2.6.34:

	commit 5f6c0181
	Author: Jesse Brandeburg <jesse.brandeburg@intel.com>
	Date:   Wed Apr 14 16:04:23 2010 -0700

	    ixgbe: fix bug with vlan strip in promsic mode

among other things added a function called ixgbe_vlan_filter_enable.
This new function wants to access and set some rx_ring parameters, but
adapter->rx_ring has already been freed.  This simply moves the free
until after the access and makes __ixgbe_shutdown look more like
ixgbe_remove.

Signed-off-by: default avatarAndy Gospodarek <andy@greyhouse.net>
Acked-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bf988435

drivers/net/ixgbe/ixgbe_main.c

+2 −1
Original line number Diff line number Diff line
@@ -5195,7 +5195,6 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake) 
		ixgbe_free_all_tx_resources(adapter);

		ixgbe_free_all_rx_resources(adapter);

	}

	ixgbe_clear_interrupt_scheme(adapter);



#ifdef CONFIG_PM

	retval = pci_save_state(pdev);
@@ -5230,6 +5229,8 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake) 


	*enable_wake = !!wufc;



	ixgbe_clear_interrupt_scheme(adapter);



	ixgbe_release_hw_control(adapter);



	pci_disable_device(pdev);