From 44b0120dafd0ed3403564bf0873e7266787d9c0a Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Wed, 27 May 2009 22:56:05 -0400
Subject: [PATCH] --- yaml --- r: 150660 b: refs/heads/master c:
 86ab04c8c1df51df7d6d3709da546e0163ac856b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e2caef96a2c6..be955e67b602 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c5b9e511fee1a856ffe6332e15c72a20d2c72f6
+refs/heads/master: 86ab04c8c1df51df7d6d3709da546e0163ac856b
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index cdfdb2eaad9f..d2fc18c1ae0d 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -1256,7 +1256,7 @@ static int ieee80211_assoc(struct wiphy *wiphy, struct net_device *dev,
 		sdata->u.mgd.flags |= IEEE80211_STA_AUTO_SSID_SEL;
 
 	ret = ieee80211_sta_set_extra_ie(sdata, req->ie, req->ie_len);
-	if (ret)
+	if (ret && ret != -EALREADY)
 		return ret;
 
 	if (req->use_mfp) {