* [PATCH] carl9170: fix hung workqueue
@ 2010-09-27 21:03 Christian Lamparter
2010-09-28 7:25 ` Johannes Berg
0 siblings, 1 reply; 3+ messages in thread
From: Christian Lamparter @ 2010-09-27 21:03 UTC (permalink / raw)
To: linux-wireless; +Cc: John W. Linville
The patch "mac80211: wait for scan work complete before
restarting hw", broke carl9170's restart path.
Previously it was possible to call ieee80211_restart_hw
from mac80211's internal workqueue. Now though it hangs
because of the flush_workqueue in the procedure.
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
---
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index 84bd38e..d9d3e9c 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -515,7 +515,7 @@ void carl9170_restart(struct ar9170 *ar, const enum carl9170_restart_reasons r)
return;
if (IS_ACCEPTING_CMD(ar) && !ar->needs_full_reset)
- ieee80211_queue_work(ar->hw, &ar->restart_work);
+ schedule_work(&ar->restart_work);
else
carl9170_usb_reset(ar);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] carl9170: fix hung workqueue
2010-09-27 21:03 [PATCH] carl9170: fix hung workqueue Christian Lamparter
@ 2010-09-28 7:25 ` Johannes Berg
2010-10-01 12:51 ` Christian Lamparter
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Berg @ 2010-09-28 7:25 UTC (permalink / raw)
To: Christian Lamparter; +Cc: linux-wireless, John W. Linville
On Mon, 2010-09-27 at 23:03 +0200, Christian Lamparter wrote:
> The patch "mac80211: wait for scan work complete before
> restarting hw", broke carl9170's restart path.
>
> Previously it was possible to call ieee80211_restart_hw
> from mac80211's internal workqueue. Now though it hangs
> because of the flush_workqueue in the procedure.
I thought I asked somebody to move that. It's expected that you are
allowed to call it -- the flush and scan cancel code there needs to be
moved into the _work_, out of the restart_hw() function.
johannes
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] carl9170: fix hung workqueue
2010-09-28 7:25 ` Johannes Berg
@ 2010-10-01 12:51 ` Christian Lamparter
0 siblings, 0 replies; 3+ messages in thread
From: Christian Lamparter @ 2010-10-01 12:51 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless, John W. Linville
On Tuesday 28 September 2010 09:25:47 Johannes Berg wrote:
> On Mon, 2010-09-27 at 23:03 +0200, Christian Lamparter wrote:
> > The patch "mac80211: wait for scan work complete before
> > restarting hw", broke carl9170's restart path.
> >
> > Previously it was possible to call ieee80211_restart_hw
> > from mac80211's internal workqueue. Now though it hangs
> > because of the flush_workqueue in the procedure.
>
> I thought I asked somebody to move that. It's expected that you are
> allowed to call it -- the flush and scan cancel code there needs to be
> moved into the _work_, out of the restart_hw() function.
>
John,
you can drop this patch and add Stanislaw's patch - series:
"[PATCH 1/6] mac80211: perform scan cancel in hw reset work"
instead.
Regards,
Chr
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-10-01 12:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-27 21:03 [PATCH] carl9170: fix hung workqueue Christian Lamparter
2010-09-28 7:25 ` Johannes Berg
2010-10-01 12:51 ` Christian Lamparter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).