From 64c9e4828b31bde571f15b30b12df0ba30a33a28 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Fri, 30 Oct 2009 15:48:43 +0100
Subject: [PATCH] --- yaml --- r: 171353 b: refs/heads/master c:
 e6e898cfea5f35d64f850277e7fa295c386cf953 h: refs/heads/master i:   171351:
 364d945d4af40b0a5dc6dad2ddd8e642cc4b18e8 v: v3

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

diff --git a/[refs] b/[refs]
index ac44cab1454b..ba88a762aec6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff9458d3ec179831ebe6966a8aa014ccb3907dc6
+refs/heads/master: e6e898cfea5f35d64f850277e7fa295c386cf953
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index 5608f6c68413..a0c7eb18a76d 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -738,13 +738,6 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
 
 	err = sta_info_insert(sta);
 	if (err) {
-		/* STA has been freed */
-		if (err == -EEXIST && layer2_update) {
-			/* Need to update layer 2 devices on reassociation */
-			sta = sta_info_get(local, mac);
-			if (sta)
-				ieee80211_send_layer2_update(sta);
-		}
 		rcu_read_unlock();
 		return err;
 	}