mac80211: don't read ERP information from (re)association response

According to the standard, the field cannot be present, so don't
try to interpret it either.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Daniel Drake <dsd@gentoo.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 0 insertions, 14 deletions

diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index 2e225aecb873..5b8f484c1673 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/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;