From patchwork Tue Nov 18 00:13:36 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. K. Cliburn" X-Patchwork-Id: 9299 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 93F1DDDE1E for ; Tue, 18 Nov 2008 11:13:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751931AbYKRANp (ORCPT ); Mon, 17 Nov 2008 19:13:45 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751371AbYKRANo (ORCPT ); Mon, 17 Nov 2008 19:13:44 -0500 Received: from rv-out-0506.google.com ([209.85.198.229]:7071 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751232AbYKRANn (ORCPT ); Mon, 17 Nov 2008 19:13:43 -0500 Received: by rv-out-0506.google.com with SMTP id k40so2659662rvb.1 for ; Mon, 17 Nov 2008 16:13:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:in-reply-to:references:x-mailer:mime-version :content-type:content-transfer-encoding; bh=VYuG7RSO3HWxRHtaVGDbGMn02P3peywm4BtwPh1tplc=; b=KtFCwa4Ab4zCzPv9D0CVF/mfDaCnPjFfPNTssgP04SOJxWoP/odR+UceKutKOJcd8A Opvc5lMGcoyhXGfkaiq2frBfxFcToPPscDhc97n6GLn6d2DwUQ5jVMNg+AXhklMqSWbP O3NY0/CwatRGrdfngsqZboRJ9RGTgeLM6dq/E= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:in-reply-to:references:x-mailer :mime-version:content-type:content-transfer-encoding; b=H7R3rqBW6JMA8ULDlovdTxkLBBBBm9xGji+2wRwtPIkUnh8L/YKzxO2AEnGHwyKaZV AJhG3nMp6vypyGaVSScM4XBDKjZQItLSa3A2qiItANpqwyucu6K8zSC+aK9FGBWPssTi Ls55HPZIvQrFFFmVwSfXXjxW52h4NGvOW/vgY= Received: by 10.140.201.4 with SMTP id y4mr2563533rvf.191.1226967222782; Mon, 17 Nov 2008 16:13:42 -0800 (PST) Received: from osprey.hogchain.net (adsl-251-48-172.jan.bellsouth.net [74.251.48.172]) by mx.google.com with ESMTPS id b39sm7418328rvf.0.2008.11.17.16.13.39 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 17 Nov 2008 16:13:41 -0800 (PST) Date: Mon, 17 Nov 2008 18:13:36 -0600 From: Jay Cliburn To: Alan Jenkins Cc: csnook@redhat.com, atl1-devel@lists.sourceforge.net, linux-kernel , netdev@vger.kernel.org Subject: Re: [atl1-devel] atl2: don't mess up irq on suspend/resume (probably msi only) Message-ID: <20081117181336.1a270561@osprey.hogchain.net> In-Reply-To: <4921E574.3090602@tuffmail.co.uk> References: <49201401.1060600@tuffmail.co.uk> <4921E574.3090602@tuffmail.co.uk> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.12.12; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org [adding netdev to cc list] On Mon, 17 Nov 2008 21:43:16 +0000 Alan Jenkins wrote: > Don't listen to me. The problem went away because when I was testing > my patch, I plugged the ethernet in and actually used it. My patch > doesn't seem to fix anything. > > So I now have the steps to reproduce this warning: remove the ethernet > cable and suspend. > > Also, I was speaking rubbish because the warning isn't on the resume > path. It seems to be when network-manager re-opens the device on > resume. > > I'll have another look for possible culprits. Hints appreciated :). Does this help? --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c index f5bdc92..5b292f0 100644 --- a/drivers/net/atlx/atl2.c +++ b/drivers/net/atlx/atl2.c @@ -1690,10 +1690,6 @@ static int atl2_resume(struct pci_dev *pdev) ATL2_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0); - err = atl2_request_irq(adapter); - if (netif_running(netdev) && err) - return err; - atl2_reset_hw(&adapter->hw); if (netif_running(netdev))