Re: patch iwlwifi-silence-tfds_in_queue-message.patch added to 2.6.32-stable tree

Re: patch iwlwifi-silence-tfds_in_queue-message.patch added to 2.6.32-stable tree

[Stefan Bader]

Greg KH wrote:
> On Mon, Mar 29, 2010 at 03:09:35PM -0700, reinette chatre wrote:
>> Hi,
>>
>> On Mon, 2010-03-29 at 13:41 -0700, gregkh@suse.de wrote:
>>> This is a note to let you know that we have just queued up the patch titled
>>>
>>>     Subject: iwlwifi: Silence tfds_in_queue message
>>>
>>> to the 2.6.32-stable tree.
>> [...]
>>
>> Please note that this patch is really just masking a problem introduced
>> by a 2.6.32 backported patch. The real fix is
>> https://patchwork.kernel.org/patch/86722/ which should be included in
>> 2.6.32.
> 
> What is the git commit id for that patch?  patchwork links don't help me
> at all.

There isn't one. The main problem only exists in 2.6.32.y
because the final hunk missed to remove the nfreed++ from
ouside the if.

Introduced by backport of in 2.6.32.y

commit a120e912eb51e347f36c71b60a1d13af74d30e83
Author: Stanislaw Gruszka <sgruszka@redhat.com>
Date:   Fri Feb 19 15:47:33 2010 -0800

    iwlwifi: sanity check before counting number of tfds can be free


> thanks,
> 
> greg k-h
> --
> To unsubscribe from this list: send the line "unsubscribe stable-commits" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [stable] patch iwlwifi-silence-tfds_in_queue-message.patch added to 2.6.32-stable tree

[Greg KH]

On Tue, Mar 30, 2010 at 09:16:02AM +0200, Stefan Bader wrote:
> Greg KH wrote:
> > On Mon, Mar 29, 2010 at 03:09:35PM -0700, reinette chatre wrote:
> >> Hi,
> >>
> >> On Mon, 2010-03-29 at 13:41 -0700, gregkh@suse.de wrote:
> >>> This is a note to let you know that we have just queued up the patch titled
> >>>
> >>>     Subject: iwlwifi: Silence tfds_in_queue message
> >>>
> >>> to the 2.6.32-stable tree.
> >> [...]
> >>
> >> Please note that this patch is really just masking a problem introduced
> >> by a 2.6.32 backported patch. The real fix is
> >> https://patchwork.kernel.org/patch/86722/ which should be included in
> >> 2.6.32.
> > 
> > What is the git commit id for that patch?  patchwork links don't help me
> > at all.
> 
> There isn't one. The main problem only exists in 2.6.32.y
> because the final hunk missed to remove the nfreed++ from
> ouside the if.
> 
> Introduced by backport of in 2.6.32.y
> 
> commit a120e912eb51e347f36c71b60a1d13af74d30e83
> Author: Stanislaw Gruszka <sgruszka@redhat.com>
> Date:   Fri Feb 19 15:47:33 2010 -0800
> 
>     iwlwifi: sanity check before counting number of tfds can be free

So, what exactly should I be doing here for the .32 stable queue?

what a mess,

greg k-h

Re: [stable] patch iwlwifi-silence-tfds_in_queue-message.patch added to 2.6.32-stable tree

[Adel Gadllah]

2010/3/30 Greg KH <greg@kroah.com>:
> On Tue, Mar 30, 2010 at 09:16:02AM +0200, Stefan Bader wrote:
>> Greg KH wrote:
>> > On Mon, Mar 29, 2010 at 03:09:35PM -0700, reinette chatre wrote:
>> >> Hi,
>> >>
>> >> On Mon, 2010-03-29 at 13:41 -0700, gregkh@suse.de wrote:
>> >>> This is a note to let you know that we have just queued up the patch titled
>> >>>
>> >>>     Subject: iwlwifi: Silence tfds_in_queue message
>> >>>
>> >>> to the 2.6.32-stable tree.
>> >> [...]
>> >>
>> >> Please note that this patch is really just masking a problem introduced
>> >> by a 2.6.32 backported patch. The real fix is
>> >> https://patchwork.kernel.org/patch/86722/ which should be included in
>> >> 2.6.32.
>> >
>> > What is the git commit id for that patch?  patchwork links don't help me
>> > at all.
>>
>> There isn't one. The main problem only exists in 2.6.32.y
>> because the final hunk missed to remove the nfreed++ from
>> ouside the if.
>>
>> Introduced by backport of in 2.6.32.y
>>
>> commit a120e912eb51e347f36c71b60a1d13af74d30e83
>> Author: Stanislaw Gruszka <sgruszka@redhat.com>
>> Date:   Fri Feb 19 15:47:33 2010 -0800
>>
>>     iwlwifi: sanity check before counting number of tfds can be free
>
> So, what exactly should I be doing here for the .32 stable queue?

Apply the patch that fixes the mess (i.e the one Reinette linked to)
;), whether this patch (the one you are about to push) goes in or not
does not matter much (i.e having it won't hurt, but the fix for the
real problem should go in).

Adel

Re: [stable] patch iwlwifi-silence-tfds_in_queue-message.patch added to 2.6.32-stable tree

[Stefan Bader]

[-- Attachment #1: Type: text/plain, Size: 1569 bytes --]

Greg KH wrote:
> On Tue, Mar 30, 2010 at 09:16:02AM +0200, Stefan Bader wrote:
>> Greg KH wrote:
>>> On Mon, Mar 29, 2010 at 03:09:35PM -0700, reinette chatre wrote:
>>>> Hi,
>>>>
>>>> On Mon, 2010-03-29 at 13:41 -0700, gregkh@suse.de wrote:
>>>>> This is a note to let you know that we have just queued up the patch titled
>>>>>
>>>>>     Subject: iwlwifi: Silence tfds_in_queue message
>>>>>
>>>>> to the 2.6.32-stable tree.
>>>> [...]
>>>>
>>>> Please note that this patch is really just masking a problem introduced
>>>> by a 2.6.32 backported patch. The real fix is
>>>> https://patchwork.kernel.org/patch/86722/ which should be included in
>>>> 2.6.32.
>>> What is the git commit id for that patch?  patchwork links don't help me
>>> at all.
>> There isn't one. The main problem only exists in 2.6.32.y
>> because the final hunk missed to remove the nfreed++ from
>> ouside the if.
>>
>> Introduced by backport of in 2.6.32.y
>>
>> commit a120e912eb51e347f36c71b60a1d13af74d30e83
>> Author: Stanislaw Gruszka <sgruszka@redhat.com>
>> Date:   Fri Feb 19 15:47:33 2010 -0800
>>
>>     iwlwifi: sanity check before counting number of tfds can be free
> 
> So, what exactly should I be doing here for the .32 stable queue?

git'ified verrsion of patchworks patch attached.

Stefan

> what a mess,
> 
> greg k-h
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/


[-- Attachment #2: 0001-pre-stable-iwlwifi-fix-nfreed.patch --]
[-- Type: text/x-diff, Size: 1207 bytes --]

>From 5d96faae63f4af4ff4d1effe46d18cc9ba203d00 Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Thu, 18 Mar 2010 14:29:33 +0000
Subject: [PATCH] iwlwifi: fix nfreed--

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@redhat.com>
Tested-by: Adel Gadllah <adel.gadllah@gmail.com>
(picked from https://patchwork.kernel.org/patch/86722/)
Signed-off-by: Stefan Bader <stefan.bader@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