From patchwork Thu Mar 25 17:50:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 48557 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 22050B7CF5 for ; Fri, 26 Mar 2010 04:50:49 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NurCc-00081H-CN; Thu, 25 Mar 2010 17:50:42 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NurCZ-00080T-Od for kernel-team@lists.ubuntu.com; Thu, 25 Mar 2010 17:50:39 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1NurCZ-0005Fm-1G for ; Thu, 25 Mar 2010 17:50:39 +0000 Received: from p5b2e4779.dip.t-dialin.net ([91.46.71.121] helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1NurCY-000289-Rx for kernel-team@lists.ubuntu.com; Thu, 25 Mar 2010 17:50:39 +0000 From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [Lucid] SRU: Fix stable regression in iwlwifi Date: Thu, 25 Mar 2010 18:50:38 +0100 Message-Id: <1269539438-3163-1-git-send-email-stefan.bader@canonical.com> X-Mailer: git-send-email 1.6.3.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com A patch to stable 2.6.32.10 missed a hunk of code (I verified this agains the original patch, too) which causes the iwlagn driver (at least) to emmit a huge number of warning messages. This patch is picked from patchworks but discussions look good to see this in stable soon, but given the impact we should apply it before. Has been proven to work in a test kernel. -Stefan From f0a2225542c9d465d6d1aa2c11e307cf210ece47 Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Thu, 18 Mar 2010 14:29:33 +0000 Subject: [PATCH] (pre-stable) iwlwifi: fix nfreed-- BugLink: https://bugs.launchpad.net/bugs/545585 During backporting of a120e912eb51e347f36c71b60a1d13af74d30e83 ("iwlwifi: sanity check before counting number of tfds can be free") we forget one hunk, what make lot of messages "free more than tfds_in_queue" show up in dmesg. Signed-off-by: Stanislaw Gruszka Tested-by: Adel Gadllah (picked from https://patchwork.kernel.org/patch/86722/) Signed-off-by: Stefan Bader Acked-by: Amit Kucheria --- drivers/net/wireless/iwlwifi/iwl-tx.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index f449f06..cf5ac00 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c @@ -1096,7 +1096,6 @@ int iwl_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index) priv->cfg->ops->lib->txq_inval_byte_cnt_tbl(priv, txq); priv->cfg->ops->lib->txq_free_tfd(priv, txq); - nfreed++; } return nfreed; }