[kernel] r15427 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sat Mar 20 15:29:20 2010
New Revision: 15427

Log:
iwlwifi: Fix repeated warnings about tfds_in_queue (Closes: #574526)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/iwlwifi-fix-nfreed.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/11

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Mar 20 15:06:33 2010	(r15426)
+++ dists/sid/linux-2.6/debian/changelog	Sat Mar 20 15:29:20 2010	(r15427)
@@ -7,6 +7,7 @@
     (previously applied only to x86)
   * linux-base: Handle duplicates in /etc/udev/rules.d/70-persistent-cd.rules
     (Closes: #574630)
+  * iwlwifi: Fix repeated warnings about tfds_in_queue (Closes: #574526)
 
   [ maximilian attems]
    * [alpha, hppa] Disable oprofile as tracing code is unsupported here.

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/iwlwifi-fix-nfreed.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/iwlwifi-fix-nfreed.patch	Sat Mar 20 15:29:20 2010	(r15427)
@@ -0,0 +1,29 @@
+From: Stanislaw Gruszka <sgruszka at redhat.com>
+Subject: [PATCH 2.6.32] iwlwifi: fix nfreed--
+Date: Thu, 18 Mar 2010 15:29:33 +0100
+
+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 <sgruszka at redhat.com>
+---
+ 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;
+ }
+-- 
+1.6.2.5
+

Modified: dists/sid/linux-2.6/debian/patches/series/11
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/11	Sat Mar 20 15:06:33 2010	(r15426)
+++ dists/sid/linux-2.6/debian/patches/series/11	Sat Mar 20 15:29:20 2010	(r15427)
@@ -1,2 +1,3 @@
 + bugfix/all/tracing-do-not-disable-interrupts-for-trace_clock_lo.patch
 + bugfix/sparc/sparc-Provide-io-read-write-16-32-be.patch
++ bugfix/all/iwlwifi-fix-nfreed.patch