[Lucid] SRU: Fix stable regression in iwlwifi

[Amit Kucheria]

On 10 Mar 25, Stefan Bader wrote:
> 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 <sgruszka at redhat.com>
> 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 <sgruszka at redhat.com>
> Tested-by: Adel Gadllah <adel.gadllah at gmail.com>
> (picked from https://patchwork.kernel.org/patch/86722/)
> Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
>

Verified that the hunk was indeed missed.

Acked-by: Amit Kucheria <amit.kucheria at canonical.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.3.3
> 
> 
> -- 
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

-- 
----------------------------------------------------------------------
Amit Kucheria, Kernel Engineer || amit.kucheria at canonical.com
----------------------------------------------------------------------