---

yaml
---
r: 78615
b: refs/heads/master
c: c27f983
h: refs/heads/master
i:
  78613: 4b30557
  78611: d1f796b
  78607: 5e7c954
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 176e4f84423af3105894a7d71b23c1a16678a6be
+refs/heads/master: c27f9830f367a041ca976ccd102f590d27d4deb2

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;