---

yaml --- r: 352708 b: refs/heads/master c: 441a33b h: refs/heads/master v: v3
git-mirror · Feb 15, 2013 · 6b7e164 · 6b7e164
1 parent f7feb14
commit 6b7e164
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b36ebd8249f403c7edf7cf68d68e9a0d0f55243
+refs/heads/master: 441a33baf1805861354fb9e3149c000311b6996f
diff --git a/trunk/net/mac80211/ieee80211_i.h b/trunk/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/trunk/net/mac80211/util.c b/trunk/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;