Message ID | 20120702090602.GA8286@redhat.com |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
On Mon, 2012-07-02 at 11:06 +0200, Stanislaw Gruszka wrote: > On Sat, Jun 30, 2012 at 03:20:06PM +0200, Paul Bolle wrote: > For some reason we are not able to authenticate, what itself is a > problem. Maybe this is wrong key offset problem and that will > be fixed by Emmanuel patch. Which I can only try if we fix the small problem you mentioned in your comment on Emmanuel's patch (reference <20120702082653.GA2479@redhat.com>, not yet archived on lkml.org), can't I? > Regarding "Queue 2 stuck", there is another fix in iwlwifi that > did not make to iwlegacy, which perhaps could help. If not here > then maybe on suspend. > > commit 342bbf3fee2fa9a18147e74b2e3c4229a4564912 > Author: Johannes Berg <johannes.berg@intel.com> > Date: Sun Mar 4 08:50:46 2012 -0800 > > iwlwifi: always monitor for stuck queues > > I'm attaching iwlegacy version of it. Thanks, I'll try it. The explanation of the iwlwifi commit makes a lot of sense: it seems to match the events found in the logs of this laptop. That's encouraging. Should I report whether the iwlegacy version works or not? > > 2) It's always "Queue 2" that's stuck. What does that queue do? > > It's TX queue, probably one used for default traffic i.e. for Best > Effort category (others are Video, Voice and Background). I see. Any thoughts on my patch (ie, the patch that is actually the subject of this thread? Paul Bolle -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jul 02, 2012 at 11:32:43AM +0200, Paul Bolle wrote: > On Mon, 2012-07-02 at 11:06 +0200, Stanislaw Gruszka wrote: > > On Sat, Jun 30, 2012 at 03:20:06PM +0200, Paul Bolle wrote: > > For some reason we are not able to authenticate, what itself is a > > problem. Maybe this is wrong key offset problem and that will > > be fixed by Emmanuel patch. > > Which I can only try if we fix the small problem you mentioned in your > comment on Emmanuel's patch (reference > <20120702082653.GA2479@redhat.com>, not yet archived on lkml.org), can't > I? Oh, you were not CCed, and lkml too, v2 patch is here: http://marc.info/?l=linux-wireless&m=134121823510017&w=2 > > Regarding "Queue 2 stuck", there is another fix in iwlwifi that > > did not make to iwlegacy, which perhaps could help. If not here > > then maybe on suspend. > > > > commit 342bbf3fee2fa9a18147e74b2e3c4229a4564912 > > Author: Johannes Berg <johannes.berg@intel.com> > > Date: Sun Mar 4 08:50:46 2012 -0800 > > > > iwlwifi: always monitor for stuck queues > > > > I'm attaching iwlegacy version of it. > > Thanks, I'll try it. The explanation of the iwlwifi commit makes a lot > of sense: it seems to match the events found in the logs of this laptop. > That's encouraging. Should I report whether the iwlegacy version works > or not? Actually I'll post it anyway. But if this patch and Emmanuel's will not fix the problem you should report it. > > > 2) It's always "Queue 2" that's stuck. What does that queue do? > > > > It's TX queue, probably one used for default traffic i.e. for Best > > Effort category (others are Video, Voice and Background). > > I see. > > Any thoughts on my patch (ie, the patch that is actually the subject of > this thread? It was applied to wireless-testing. Stanislaw -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 2012-07-02 at 11:39 +0200, Stanislaw Gruszka wrote: > On Mon, Jul 02, 2012 at 11:32:43AM +0200, Paul Bolle wrote: > Oh, you were not CCed, and lkml too, v2 patch is here: > http://marc.info/?l=linux-wireless&m=134121823510017&w=2 Thanks. > > Should I report whether the iwlegacy version works > > or not? > Actually I'll post it anyway. But if this patch and Emmanuel's will not > fix the problem you should report it. I'll try to report any oddities I notice. > > Any thoughts on my patch (ie, the patch that is actually the subject of > > this thread? > It was applied to wireless-testing. That's nice. Paul Bolle -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c index cbf2dc1..5d4807c 100644 --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c @@ -4767,14 +4767,12 @@ il_bg_watchdog(unsigned long data) return; /* monitor and check for other stuck queues */ - if (il_is_any_associated(il)) { - for (cnt = 0; cnt < il->hw_params.max_txq_num; cnt++) { - /* skip as we already checked the command queue */ - if (cnt == il->cmd_queue) - continue; - if (il_check_stuck_queue(il, cnt)) - return; - } + for (cnt = 0; cnt < il->hw_params.max_txq_num; cnt++) { + /* skip as we already checked the command queue */ + if (cnt == il->cmd_queue) + continue; + if (il_check_stuck_queue(il, cnt)) + return; } mod_timer(&il->watchdog,