Patchwork [SRU,Quantal/Raring] UBUNTU: SAUCE: alx: Don't check netif_running() before powering up

login
register
mail settings
Submitter Tim Gardner
Date April 24, 2013, 7:35 p.m.
Message ID <1366832141-34735-1-git-send-email-tim.gardner@canonical.com>
Download mbox | patch
Permalink /patch/239310/
State New
Headers show

Comments

Tim Gardner - April 24, 2013, 7:35 p.m.
(sent upstream to unified-drivers@lists.infradead.org)

The resume function must power up the device regardless of the state
of the network stack.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---

Tested on an AMD system with HW that exhibits the problem.

 ubuntu/alx/alx_main.c |    3 ---
 1 file changed, 3 deletions(-)
Tim Gardner - April 24, 2013, 7:37 p.m.
On 04/24/2013 01:35 PM, Tim Gardner wrote:
> (sent upstream to unified-drivers@lists.infradead.org)
> 
> The resume function must power up the device regardless of the state
> of the network stack.
> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
> 
> Tested on an AMD system with HW that exhibits the problem.
> 
>  ubuntu/alx/alx_main.c |    3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/ubuntu/alx/alx_main.c b/ubuntu/alx/alx_main.c
> index 700ebf1..03bda8b 100644
> --- a/ubuntu/alx/alx_main.c
> +++ b/ubuntu/alx/alx_main.c
> @@ -1694,9 +1694,6 @@ static int alx_resume(struct device *dev)
>  	struct alx_hw *hw = &adpt->hw;
>  	int err;
>  
> -	if (!netif_running(netdev))
> -		return 0;
> -
>  	pci_set_power_state(pdev, PCI_D0);
>  	pci_restore_state(pdev);
>  	pci_save_state(pdev);
> 

http://bugs.launchpad.net/bugs/1172415
Brad Figg - April 24, 2013, 7:56 p.m.
On 04/24/2013 12:35 PM, Tim Gardner wrote:
> (sent upstream to unified-drivers@lists.infradead.org)
> 
> The resume function must power up the device regardless of the state
> of the network stack.
> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
> 
> Tested on an AMD system with HW that exhibits the problem.
> 
>  ubuntu/alx/alx_main.c |    3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/ubuntu/alx/alx_main.c b/ubuntu/alx/alx_main.c
> index 700ebf1..03bda8b 100644
> --- a/ubuntu/alx/alx_main.c
> +++ b/ubuntu/alx/alx_main.c
> @@ -1694,9 +1694,6 @@ static int alx_resume(struct device *dev)
>  	struct alx_hw *hw = &adpt->hw;
>  	int err;
>  
> -	if (!netif_running(netdev))
> -		return 0;
> -
>  	pci_set_power_state(pdev, PCI_D0);
>  	pci_restore_state(pdev);
>  	pci_save_state(pdev);
>
Steve Conklin - April 24, 2013, 8 p.m.
On 04/24/2013 02:35 PM, Tim Gardner wrote:
> (sent upstream to unified-drivers@lists.infradead.org)
> 
> The resume function must power up the device regardless of the state
> of the network stack.
> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
> 
> Tested on an AMD system with HW that exhibits the problem.
> 
>  ubuntu/alx/alx_main.c |    3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/ubuntu/alx/alx_main.c b/ubuntu/alx/alx_main.c
> index 700ebf1..03bda8b 100644
> --- a/ubuntu/alx/alx_main.c
> +++ b/ubuntu/alx/alx_main.c
> @@ -1694,9 +1694,6 @@ static int alx_resume(struct device *dev)
>  	struct alx_hw *hw = &adpt->hw;
>  	int err;
>  
> -	if (!netif_running(netdev))
> -		return 0;
> -
>  	pci_set_power_state(pdev, PCI_D0);
>  	pci_restore_state(pdev);
>  	pci_save_state(pdev);
>
Tim Gardner - April 25, 2013, 12:32 p.m.

Patch

diff --git a/ubuntu/alx/alx_main.c b/ubuntu/alx/alx_main.c
index 700ebf1..03bda8b 100644
--- a/ubuntu/alx/alx_main.c
+++ b/ubuntu/alx/alx_main.c
@@ -1694,9 +1694,6 @@  static int alx_resume(struct device *dev)
 	struct alx_hw *hw = &adpt->hw;
 	int err;
 
-	if (!netif_running(netdev))
-		return 0;
-
 	pci_set_power_state(pdev, PCI_D0);
 	pci_restore_state(pdev);
 	pci_save_state(pdev);