From patchwork Wed Apr 24 19:35:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 239310 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 53F482C0100 for ; Thu, 25 Apr 2013 05:36:04 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UV5Tv-0002BX-70; Wed, 24 Apr 2013 19:35:55 +0000 Received: from mail.tpi.com ([70.99.223.143]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UV5Ts-0002AI-JL for kernel-team@lists.ubuntu.com; Wed, 24 Apr 2013 19:35:52 +0000 Received: from salmon.rtg.net (mail.tpi.com [70.99.223.143]) by mail.tpi.com (Postfix) with ESMTP id 1FEBC4F079; Wed, 24 Apr 2013 12:35:51 -0700 (PDT) Received: by salmon.rtg.net (Postfix, from userid 1000) id C2F0522B29; Wed, 24 Apr 2013 13:35:50 -0600 (MDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH SRU Quantal/Raring] UBUNTU: SAUCE: alx: Don't check netif_running() before powering up Date: Wed, 24 Apr 2013 13:35:41 -0600 Message-Id: <1366832141-34735-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com (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 --- 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);