From 82fc91feddba2a94613e8e6d3efbf5e3572f5057 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 1 Jul 2009 21:26:49 +0200
Subject: [PATCH] --- yaml --- r: 158874 b: refs/heads/master c:
 0575606b086ad216b7b1976ca9b9a6e711db92f0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d863d30514e3..cfef80589a6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ebbe6bd51a259e16608b3fd7b578f5dd1292a45
+refs/heads/master: 0575606b086ad216b7b1976ca9b9a6e711db92f0
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 383392b04282..58135a5096af 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -1511,9 +1511,15 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
 				    !ieee80211_sta_wep_configured(sdata))
 					continue;
 				ifmgd->auth_alg = algs[pos];
-				break;
+				ifmgd->auth_tries = 0;
+				return;
 			}
 		}
+		/* nothing else to try -- give up */
+		cfg80211_send_rx_auth(sdata->dev, (u8 *) mgmt, len,
+				      GFP_KERNEL);
+		ifmgd->state = IEEE80211_STA_MLME_DISABLED;
+		ieee80211_recalc_idle(sdata->local);
 		return;
 	}