Subject: Re: [PATCH 3/3] e1000e: fix EEH recovery during reset on PPC

From: Jeff Garzik <[email-masked]>
Date: Fri, 27 Jun 2008 00:56:17 -0400

Jeff Kirsher wrote:
> EEH is not recovering in a reasonable amount of time on PPC during
> e1000e_down().
> 
> Signed-off-by: Jeff Kirsher <[email-masked]>
> Signed-off-by: Jesse Brandeburg <[email-masked]>
> ---
> 
>  drivers/net/e1000e/netdev.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
> index ccb8ca2..0320925 100644
> --- a/drivers/net/e1000e/netdev.c
> +++ b/drivers/net/e1000e/netdev.c
> @@ -2535,7 +2535,8 @@ void e1000e_down(struct e1000_adapter *adapter)
>  	adapter->link_speed = 0;
>  	adapter->link_duplex = 0;
>  
> -	e1000e_reset(adapter);
> +	if (!pci_channel_offline(adapter->pdev))
> +		e1000e_reset(adapter);
>  	e1000_clean_tx_ring(adapter);
>  	e1000_clean_rx_ring(adapter);

IMO for this type of change, you should consider putting all these 
changes into a single patch.

It's exactly the same logical change, so no need to split it up into 
three patches.