mac80211: don't pick up WPA vendor IE

There's no use for it, WPA is entirely handled in
wpa_supplicant in userspace, so don't pick the IE.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 52bf954ef61c13d02285ad5b4745096f2b14d041..8f9564460cb015e371b9e900bc3ff8cf50bb7a66 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1175,7 +1175,6 @@ struct ieee802_11_elems {
        struct ieee80211_tim_ie *tim;
        u8 *ibss_params;
        u8 *challenge;
-       u8 *wpa;
        u8 *rsn;
        u8 *erp_info;
        u8 *ext_supp_rates;
@@ -1208,7 +1207,6 @@ struct ieee802_11_elems {
        u8 tim_len;
        u8 ibss_params_len;
        u8 challenge_len;
-       u8 wpa_len;
        u8 rsn_len;
        u8 erp_info_len;
        u8 ext_supp_rates_len;

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 218cb52f2b59dff9996f85f47dd79a327a2d305e..b231bc2ed740a40c38f1418370d35b33c8e76b24 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -739,11 +739,7 @@ u32 ieee802_11_parse_elems_crc(u8 *start, size_t len,
                                if (calc_crc)
                                        crc = crc32_be(crc, pos - 2, elen + 2);
 
-                               if (pos[3] == 1) {
-                                       /* OUI Type 1 - WPA IE */
-                                       elems->wpa = pos;
-                                       elems->wpa_len = elen;
-                               } else if (elen >= 5 && pos[3] == 2) {
+                               if (elen >= 5 && pos[3] == 2) {
                                        /* OUI Type 2 - WMM IE */
                                        if (pos[4] == 0) {
                                                elems->wmm_info = pos;