From 9203adb63435c190a33ce8e253578ac3e5380ca2 Mon Sep 17 00:00:00 2001
From: Will Hawkins <hawkinsw@opentechinstitute.org>
Date: Tue, 19 Jun 2012 17:59:13 -0400
Subject: [PATCH] --- yaml --- r: 314830 b: refs/heads/master c:
 452a6d22615bb8262a932b362f41fc5d89f03293 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index afe022d0ae49..96ff19737795 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6abe0563224f8540c88e1d84d2bb394bd408c951
+refs/heads/master: 452a6d22615bb8262a932b362f41fc5d89f03293
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
index 725cb4be229d..ff46ff424941 100644
--- a/trunk/net/mac80211/ibss.c
+++ b/trunk/net/mac80211/ibss.c
@@ -279,7 +279,7 @@ static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta,
 	/* If it fails, maybe we raced another insertion? */
 	if (sta_info_insert_rcu(sta))
 		return sta_info_get(sdata, addr);
-	if (auth) {
+	if (auth && !sdata->u.ibss.auth_frame_registrations) {
 		ibss_vdbg("TX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=1)\n",
 			  sdata->vif.addr, sdata->u.ibss.bssid, addr);
 		ieee80211_send_auth(sdata, 1, WLAN_AUTH_OPEN, NULL, 0,