[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <9929d2390906101553q742f2d9v28f09e8880527df8@mail.gmail.com>
Date: Wed, 10 Jun 2009 15:53:31 -0700
From: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
To: Andre Detsch <adetsch@...ibm.com>
Cc: netdev@...r.kernel.org, e1000-devel@...ts.sourceforge.net,
mmlnx@...ibm.com
Subject: Re: [PATCH] e1000: return PCI_ERS_RESULT_DISCONNECT on permanent
error
On Fri, Jun 5, 2009 at 11:40 AM, Andre Detsch<adetsch@...ibm.com> wrote:
> PCI drivers that implement the io_error_detected callback
> should return PCI_ERS_RESULT_DISCONNECT if the state
> passed in is pci_channel_io_perm_failure. This state is
> not checked in many of the network drivers.
>
> This patch fixes the omission in the e1000 driver.
>
> Based on Mike Mason's similar patch for e1000e.
>
> Signed-off-by: Andre Detsch <adetsch@...ibm.com>
> Cc: Mike Mason <mmlnx@...ibm.com>
> ---
> drivers/net/e1000/e1000_main.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
> index 05e87a5..df1d5ca 100644
> --- a/drivers/net/e1000/e1000_main.c
> +++ b/drivers/net/e1000/e1000_main.c
> @@ -4816,6 +4816,9 @@ static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
> struct e1000_adapter *adapter = netdev_priv(netdev);
>
> netif_device_detach(netdev);
> +
> + if (state == pci_channel_io_perm_failure)
> + return PCI_ERS_RESULT_DISCONNECT;
>
> if (netif_running(netdev))
> e1000_down(adapter);
> --
Thanks, I have added this to my queue and will push it with the e1000e fix.
--
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