From a1e75fedf142e43cee2d7310bc943ab00559098c Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Mon, 26 Jun 2006 16:34:29 -0400 Subject: [PATCH] --- yaml --- r: 32091 b: refs/heads/master c: 4a232e725b5cc1bc7fc5b177424a9ff8313b23ad h: refs/heads/master i: 32089: 586b2172f425ca25eea3e8fcb8b90a0867bd5d29 32087: 789946650e9bd4593a133eccdd9fc05a74bfed23 v: v3 --- [refs] | 2 +- trunk/net/ieee80211/softmac/ieee80211softmac_assoc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 98a6a6eb3b53..19c4065cab52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f7eb40749f4b0cf9d3892d9680c97b1bfce6de6 +refs/heads/master: 4a232e725b5cc1bc7fc5b177424a9ff8313b23ad diff --git a/trunk/net/ieee80211/softmac/ieee80211softmac_assoc.c b/trunk/net/ieee80211/softmac/ieee80211softmac_assoc.c index 7f6ef0eee0ba..44215ce64d4e 100644 --- a/trunk/net/ieee80211/softmac/ieee80211softmac_assoc.c +++ b/trunk/net/ieee80211/softmac/ieee80211softmac_assoc.c @@ -303,7 +303,7 @@ ieee80211softmac_assoc_work(void *d) dprintk(KERN_INFO PFX "Already requested authentication, waiting...\n"); if(!mac->associnfo.assoc_wait) { mac->associnfo.assoc_wait = 1; - ieee80211softmac_notify_internal(mac, IEEE80211SOFTMAC_EVENT_ANY, found, ieee80211softmac_assoc_notify, NULL, GFP_KERNEL); + ieee80211softmac_notify_internal(mac, IEEE80211SOFTMAC_EVENT_ANY, found, ieee80211softmac_assoc_notify_auth, NULL, GFP_KERNEL); } return; } @@ -314,7 +314,7 @@ ieee80211softmac_assoc_work(void *d) if(!mac->associnfo.assoc_wait) { dprintk(KERN_INFO PFX "Cannot associate without being authenticated, requested authentication\n"); mac->associnfo.assoc_wait = 1; - ieee80211softmac_notify_internal(mac, IEEE80211SOFTMAC_EVENT_ANY, found, ieee80211softmac_assoc_notify, NULL, GFP_KERNEL); + ieee80211softmac_notify_internal(mac, IEEE80211SOFTMAC_EVENT_ANY, found, ieee80211softmac_assoc_notify_auth, NULL, GFP_KERNEL); } } else { printkl(KERN_WARNING PFX "Not authenticated, but requesting authentication failed. Giving up to associate\n");