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");