diff --git a/[refs] b/[refs]
index d4552236b249..2dbb7ddaf05e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7519a8f0778bdb14f07cf685fa5fee6ab07e734c
+refs/heads/master: e374055afbf92c8d128d8538aafc7e765838206e
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 9d51e278c1e5..a8755df0cf74 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2415,8 +2415,10 @@ static int ieee80211_sta_config_auth(struct ieee80211_sub_if_data *sdata,
 							 ifsta->ssid_len);
 			ifsta->state = IEEE80211_STA_MLME_AUTHENTICATE;
 			set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request);
-		} else
+		} else {
+			ifsta->assoc_scan_tries = 0;
 			ifsta->state = IEEE80211_STA_MLME_DISABLED;
+		}
 	}
 	return -1;
 }