[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <200612101849.47179.mb@bu3sch.de>
Date: Sun, 10 Dec 2006 18:49:46 +0100
From: Michael Buesch <mb@...sch.de>
To: Ulrich Kunitz <kune@...ne-taler.de>
Cc: netdev@...r.kernel.org, Andrew Morton <akpm@...l.org>,
"John W. Linville" <linville@...driver.com>,
Johannes Berg <johannes@...solutions.net>, dsd@...too.org
Subject: Re: [PATCH] ieee80211softmac: Fix errors related to the work_struct changes
On Sunday 10 December 2006 18:39, Ulrich Kunitz wrote:
> The signature of work functions changed recently from a context
> pointer to the work structure pointer. This caused a problem in
> the ieee80211softmac code, because the ieee80211softmac_assox_work
> function has been called directly with a parameter explicitly
> casted to (void*). This compiled correctly but resulted in a
> softlock, because mutex_lock was called with the wrong memory
> address. The patch fixes the problem. Another issue was a wrong
> call of the schedule_work function. Softmac works again and this
> fixes the problem I mentioned earlier in the zd1211rw rx tasklet
> patch. The patch is against Linus' tree (commit af1713e0).
>
> Signed-off-by: Ulrich Kunitz <kune@...ne-taler.de>
> ---
> net/ieee80211/softmac/ieee80211softmac_assoc.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c
> index eec1a1d..a824852 100644
> --- a/net/ieee80211/softmac/ieee80211softmac_assoc.c
> +++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
> @@ -167,7 +167,7 @@ static void
> ieee80211softmac_assoc_notify_scan(struct net_device *dev, int event_type, void *context)
> {
> struct ieee80211softmac_device *mac = ieee80211_priv(dev);
> - ieee80211softmac_assoc_work((void*)mac);
> + ieee80211softmac_assoc_work(&mac->associnfo.work.work);
> }
>
> static void
> @@ -177,7 +177,7 @@ ieee80211softmac_assoc_notify_auth(struc
>
> switch (event_type) {
> case IEEE80211SOFTMAC_EVENT_AUTHENTICATED:
> - ieee80211softmac_assoc_work((void*)mac);
> + ieee80211softmac_assoc_work(&mac->associnfo.work.work);
> break;
> case IEEE80211SOFTMAC_EVENT_AUTH_FAILED:
> case IEEE80211SOFTMAC_EVENT_AUTH_TIMEOUT:
> @@ -438,7 +438,7 @@ ieee80211softmac_try_reassoc(struct ieee
>
> spin_lock_irqsave(&mac->lock, flags);
> mac->associnfo.associating = 1;
> - schedule_work(&mac->associnfo.work);
> + schedule_delayed_work(&mac->associnfo.work, 0);
Why do you use a zero delay here? What does that fix?
> spin_unlock_irqrestore(&mac->lock, flags);
> }
--
Greetings Michael.
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists