Commit 441a33ba authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
parent 5b36ebd8

net/mac80211/ieee80211_i.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

net/mac80211/util.c

+1 −5
Original line number Diff line number Diff line
@@ -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;