Commit:     6f07a8a3eb2adbfacd1322862368da4eb9dd3b45
Parent:     4d1feabcbf41f875447a392015acd0796f57baf6
Author:     Ulrich Kunitz <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 10 18:39:08 2006 +0100
Committer:  John W. Linville <[EMAIL PROTECTED]>
CommitDate: Tue Dec 19 16:16:15 2006 -0500

    [PATCH] ieee80211softmac: Fix errors related to the work_struct changes
    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 <[EMAIL PROTECTED]>
    Acked-by: Michael Buesch <[EMAIL PROTECTED]>
    Signed-off-by: Larry Finger <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
 net/ieee80211/softmac/ieee80211softmac_assoc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c 
index e3f37fd..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->;
 static void
@@ -177,7 +177,7 @@ ieee80211softmac_assoc_notify_auth(struct net_device *dev, 
int event_type, void
        switch (event_type) {
-               ieee80211softmac_assoc_work((void*)mac);
+               ieee80211softmac_assoc_work(&mac->;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to