From 1b8e5497a4b2f3bdc8813e6d8b658fbff9fc58ed Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 27 Mar 2013 14:30:12 +0100
Subject: [PATCH] --- yaml --- r: 369403 b: refs/heads/master c:
 1cd8e88e17729f57a9c7f751103e522596bb5de2 h: refs/heads/master i:   369401:
 946136eb1ade3de55c30758ff54d8e649994a4b2   369399:
 6208d1369c003823d94fc2bca772cc843c1561b3 v: v3

---
 [refs]                           | 2 +-
 trunk/net/mac80211/ibss.c        | 2 +-
 trunk/net/mac80211/ieee80211_i.h | 1 -
 trunk/net/mac80211/mesh.c        | 2 +-
 trunk/net/mac80211/mlme.c        | 2 +-
 trunk/net/mac80211/util.c        | 6 ++++--
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 23c671991789..acd29376a653 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6dfba841c4d38312115dc6b08d86cc496af7e88
+refs/heads/master: 1cd8e88e17729f57a9c7f751103e522596bb5de2
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
index 5ab32e2a7b56..2a0b2186d98f 100644
--- a/trunk/net/mac80211/ibss.c
+++ b/trunk/net/mac80211/ibss.c
@@ -463,7 +463,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
 	struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
 	bool rates_updated = false;
 
-	if (elems->ds_params && elems->ds_params_len == 1)
+	if (elems->ds_params)
 		freq = ieee80211_channel_to_frequency(elems->ds_params[0],
 						      band);
 	else
diff --git a/trunk/net/mac80211/ieee80211_i.h b/trunk/net/mac80211/ieee80211_i.h
index bb4bfe43bf40..eccd1d805ecc 100644
--- a/trunk/net/mac80211/ieee80211_i.h
+++ b/trunk/net/mac80211/ieee80211_i.h
@@ -1186,7 +1186,6 @@ struct ieee802_11_elems {
 	/* length of them, respectively */
 	u8 ssid_len;
 	u8 supp_rates_len;
-	u8 ds_params_len;
 	u8 tim_len;
 	u8 challenge_len;
 	u8 rsn_len;
diff --git a/trunk/net/mac80211/mesh.c b/trunk/net/mac80211/mesh.c
index aead5410c622..0acc2874d294 100644
--- a/trunk/net/mac80211/mesh.c
+++ b/trunk/net/mac80211/mesh.c
@@ -907,7 +907,7 @@ static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
 	    (!elems.rsn && sdata->u.mesh.security != IEEE80211_MESH_SEC_NONE))
 		return;
 
-	if (elems.ds_params && elems.ds_params_len == 1)
+	if (elems.ds_params)
 		freq = ieee80211_channel_to_frequency(elems.ds_params[0], band);
 	else
 		freq = rx_status->freq;
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index e12fedcfa988..f76c58fb3bdc 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2695,7 +2695,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
 		}
 	}
 
-	if (elems->ds_params && elems->ds_params_len == 1)
+	if (elems->ds_params)
 		freq = ieee80211_channel_to_frequency(elems->ds_params[0],
 						      rx_status->band);
 	else
diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c
index 2708b270e944..0f7d1c20f8ac 100644
--- a/trunk/net/mac80211/util.c
+++ b/trunk/net/mac80211/util.c
@@ -739,8 +739,10 @@ u32 ieee802_11_parse_elems_crc(u8 *start, size_t len,
 			elems->supp_rates_len = elen;
 			break;
 		case WLAN_EID_DS_PARAMS:
-			elems->ds_params = pos;
-			elems->ds_params_len = elen;
+			if (elen >= 1)
+				elems->ds_params = pos;
+			else
+				elem_parse_failed = true;
 			break;
 		case WLAN_EID_TIM:
 			if (elen >= sizeof(struct ieee80211_tim_ie)) {