---

yaml --- r: 150660 b: refs/heads/master c: 86ab04c h: refs/heads/master v: v3
git-mirror · Jun 3, 2009 · 44b0120 · 44b0120
1 parent 3d25bc5
commit 44b0120
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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) {