From a0013e9d3aa6027e1ff7700c723d9ca6770a64a0 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 19 Dec 2007 23:38:24 +0100
Subject: [PATCH] --- yaml --- r: 78615 b: refs/heads/master c:
 c27f9830f367a041ca976ccd102f590d27d4deb2 h: refs/heads/master i:   78613:
 4b30557bc5842e52092ceb27dc80efd4719509ca   78611:
 d1f796b33ec789f679485ecafebcf55ee445fa0e   78607:
 5e7c95475fb73a16141adb56fb20896b18046d24 v: v3

---
 [refs]                             |  2 +-
 trunk/net/mac80211/ieee80211_sta.c | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 665b933eaf11..b53946e45217 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 176e4f84423af3105894a7d71b23c1a16678a6be
+refs/heads/master: c27f9830f367a041ca976ccd102f590d27d4deb2
diff --git a/trunk/net/mac80211/ieee80211_sta.c b/trunk/net/mac80211/ieee80211_sta.c
index 2e225aecb873..5b8f484c1673 100644
--- a/trunk/net/mac80211/ieee80211_sta.c
+++ b/trunk/net/mac80211/ieee80211_sta.c
@@ -1371,20 +1371,6 @@ static void ieee80211_rx_mgmt_assoc_resp(struct net_device *dev,
 		return;
 	}
 
-	/* it probably doesn't, but if the frame includes an ERP value then
-	 * update our stored copy */
-	if (elems.erp_info && elems.erp_info_len >= 1) {
-		struct ieee80211_sta_bss *bss
-			= ieee80211_rx_bss_get(dev, ifsta->bssid,
-					       local->hw.conf.channel,
-					       ifsta->ssid, ifsta->ssid_len);
-		if (bss) {
-			bss->erp_value = elems.erp_info[0];
-			bss->has_erp_value = 1;
-			ieee80211_rx_bss_put(dev, bss);
-		}
-	}
-
 	printk(KERN_DEBUG "%s: associated\n", dev->name);
 	ifsta->aid = aid;
 	ifsta->ap_capab = capab_info;