2013-02-12 15:28:08

by Johannes Berg

Subject: [PATCH] mac80211: don't pick up WPA vendor IE

From: Johannes Berg <[email protected]>

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 <[email protected]>
---
net/mac80211/ieee80211_i.h | 2 --
net/mac80211/util.c | 6 +-----
2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 1224859..ab19342 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1166,7 +1166,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;
@@ -1201,7 +1200,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 7fca949..858ca57 100644
--- 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;
--
1.8.0

2013-02-14 17:33:03

by Johannes Berg

Subject: Re: [PATCH] mac80211: don't pick up WPA vendor IE

On Tue, 2013-02-12 at 16:28 +0100, Johannes Berg wrote:
> From: Johannes Berg <[email protected]>
>
> There's no use for it, WPA is entirely handled in
> wpa_supplicant in userspace, so don't pick the IE.

Applied.

johannes