From patchwork Sun Oct 10 19:03:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 244581 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9AJ3XIN018397 for ; Sun, 10 Oct 2010 19:03:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751961Ab0JJTDc (ORCPT ); Sun, 10 Oct 2010 15:03:32 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:58545 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751709Ab0JJTDb (ORCPT ); Sun, 10 Oct 2010 15:03:31 -0400 Received: from [192.168.4.185] (helo=localhost) by shadbolt.decadent.org.uk with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1P51Ax-0000Q9-71; Sun, 10 Oct 2010 20:03:17 +0100 Received: from ben by localhost with local (Exim 4.72) (envelope-from ) id 1P51Av-0000KZ-Lw; Sun, 10 Oct 2010 20:03:13 +0100 From: Ben Hutchings To: Julien Cristau Cc: Johannes Berg , 599345@bugs.debian.org, ilw@linux.intel.com, linux-wireless@vger.kernel.org In-Reply-To: <1286437870.3657.16.camel@jlt3.sipsolutions.net> References: <20101006191947.GA3036@radis.liafa.jussieu.fr> <1286402043.2955.81.camel@localhost> <1286437870.3657.16.camel@jlt3.sipsolutions.net> Date: Sun, 10 Oct 2010 20:03:13 +0100 Message-ID: <1286737393.2955.225.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 X-SA-Exim-Connect-IP: 192.168.4.185 X-SA-Exim-Mail-From: ben@decadent.org.uk X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on shadbolt.decadent.org.uk X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=ALL_TRUSTED autolearn=disabled version=3.2.5 Subject: Re: Bug#599345: linux-image-2.6.32-5-amd64: iwlagn allocation failure X-SA-Exim-Version: 4.2.1 (built Wed, 25 Jun 2008 17:14:11 +0000) X-SA-Exim-Scanned: Yes (on shadbolt.decadent.org.uk) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sun, 10 Oct 2010 19:03:33 +0000 (UTC) diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index c56d355..6323bd7 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -438,7 +438,7 @@ void iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq) /* Sanity check on number of chunks */ num_tbs = iwl_tfd_get_num_tbs(tfd); - if (num_tbs >= IWL_NUM_OF_TBS) { + if (num_tbs >= 2) { IWL_ERR(priv, "Too many chunks: %i\n", num_tbs); /* @todo issue fatal error, it is quite serious situation */ return; diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 8f98d72..48927f2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h @@ -197,7 +197,7 @@ struct iwl_queue { /* One for each TFD */ struct iwl_tx_info { - struct sk_buff *skb[IWL_NUM_OF_TBS - 1]; + struct sk_buff *skb[1]; }; /**