[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <AANLkTimSGrmLjkEaEli1T2U0XAHtTWysFrV2RcMH89IC@mail.gmail.com>
Date: Wed, 16 Jun 2010 16:54:22 -0700
From: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
To: Andy Gospodarek <andy@...yhouse.net>
Cc: netdev@...r.kernel.org
Subject: Re: [PATCH net-2.6] ixgbe: fix panic when shutting down system with
WoL enabled
On Wed, Jun 16, 2010 at 13:01, Andy Gospodarek <andy@...yhouse.net> wrote:
>
> This patch added to 2.6.34:
>
> commit 5f6c01819979afbfec7e0b15fe52371b8eed87e8
> Author: Jesse Brandeburg <jesse.brandeburg@...el.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: Andy Gospodarek <andy@...yhouse.net>
> ---
> drivers/net/ixgbe/ixgbe_main.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
> index ce30c62..e237748 100644
> --- a/drivers/net/ixgbe/ixgbe_main.c
> +++ b/drivers/net/ixgbe/ixgbe_main.c
> @@ -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);
> --
> 1.6.2.5
>
Thanks Andy, I have added the patch to my queue.
--
Cheers,
Jeff
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists