From e79b25311c11748c518f98a9623e930b7f44e621 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 23 Jul 2009 16:50:16 +0200
Subject: [PATCH] --- yaml --- r: 159253 b: refs/heads/master c:
 485318471e85c1ddb5e3056fa30fdbbc46d759c6 h: refs/heads/master i:   159251:
 538118b559f6bc84c56e67fd4df0a9ef0cb02e6b v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mlme.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a76050a445a7..3c3a7afdc011 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09f97e0fc4ae81f151bd76b97e28d2af429c1427
+refs/heads/master: 485318471e85c1ddb5e3056fa30fdbbc46d759c6
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 52b6f8327a5b..807ab89bdad9 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2377,6 +2377,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
 
 	wk->state = IEEE80211_MGD_STATE_PROBE;
 	wk->auth_alg = auth_alg;
+	wk->timeout = jiffies; /* run right away */
 
 	/*
 	 * XXX: if still associated need to tell AP that we're going
@@ -2448,6 +2449,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
 
 	wk->state = IEEE80211_MGD_STATE_ASSOC;
 	wk->tries = 0;
+	wk->timeout = jiffies; /* run right away */
 
 	if (req->use_mfp) {
 		ifmgd->mfp = IEEE80211_MFP_REQUIRED;