From patchwork Wed Apr 1 06:38:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 25462 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 04427DDDF9 for ; Wed, 1 Apr 2009 17:38:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757448AbZDAGij (ORCPT ); Wed, 1 Apr 2009 02:38:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757102AbZDAGij (ORCPT ); Wed, 1 Apr 2009 02:38:39 -0400 Received: from qmta05.westchester.pa.mail.comcast.net ([76.96.62.48]:54128 "EHLO QMTA05.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756801AbZDAGij (ORCPT ); Wed, 1 Apr 2009 02:38:39 -0400 Received: from OMTA05.westchester.pa.mail.comcast.net ([76.96.62.43]) by QMTA05.westchester.pa.mail.comcast.net with comcast id a6XF1b0060vyq2s556edno; Wed, 01 Apr 2009 06:38:37 +0000 Received: from lost.foo-projects.org ([63.64.152.142]) by OMTA05.westchester.pa.mail.comcast.net with comcast id a6eL1b00E34bfcX3R6eNvJ; Wed, 01 Apr 2009 06:38:35 +0000 From: Jeff Kirsher Subject: [PATCH 2/5] igb: set num_rx/tx_queues to 0 when queues are freed To: davem@davemloft.net Cc: netdev@vger.kernel.org, gospo@redhat.com, Alexander Duyck , Jeff Kirsher Date: Tue, 31 Mar 2009 23:38:19 -0700 Message-ID: <20090401063819.3046.60000.stgit@lost.foo-projects.org> In-Reply-To: <20090401063759.3046.89960.stgit@lost.foo-projects.org> References: <20090401063759.3046.89960.stgit@lost.foo-projects.org> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Alexander Duyck An issue was seen on suspend in which the system reported a page fault. This was due to the new reg_idx code being called after the queues were freed. This update prevents any for loops from going through the queues by setting the number of queues to 0 when they are freed. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher --- drivers/net/igb/igb_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) -- 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/igb/igb_main.c b/drivers/net/igb/igb_main.c index be02045..10b095d 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -420,6 +420,9 @@ static void igb_free_queues(struct igb_adapter *adapter) for (i = 0; i < adapter->num_rx_queues; i++) netif_napi_del(&adapter->rx_ring[i].napi); + adapter->num_rx_queues = 0; + adapter->num_tx_queues = 0; + kfree(adapter->tx_ring); kfree(adapter->rx_ring); }