diff --git a/[refs] b/[refs]
index 8671ac23d444..a8ed585aaa9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67e2eb27958cae758ccbc86443c360ec285acc3e
+refs/heads/master: 90be561b119a9e5439733f09cc70bd4ce9ec8022
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 0336dbb45ac5..8045fd63616b 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -1098,7 +1098,7 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk,
 	if (err) {
 		printk(KERN_DEBUG "%s: failed to insert STA entry for"
 		       " the AP (error %d)\n", sdata->name, err);
-		return RX_MGMT_CFG80211_ASSOC_ERROR;
+		return false;
 	}
 
 	if (elems.wmm_param)