From: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Date: Wed, 25 Jul 2012 10:56:53 +0000 (+0300)
Subject: cfg80211: unify IE search
X-Git-Tag: v3.7-rc1~70^2~42^2~2^2~47
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e21768928d73df55e648869d3ae159475d1e4b7d;p=~emulex%2Finfiniband.git

cfg80211: unify IE search

Remove ah-hoc IE search code found in the ieee80211_bss_get_ie()
and use cfg80211_find_ie() instead.

Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 26f8cd30f71..ce393dd8c92 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -684,22 +684,10 @@ EXPORT_SYMBOL(cfg80211_classify8021d);
 
 const u8 *ieee80211_bss_get_ie(struct cfg80211_bss *bss, u8 ie)
 {
-	u8 *end, *pos;
-
-	pos = bss->information_elements;
-	if (pos == NULL)
+	if (bss->information_elements == NULL)
 		return NULL;
-	end = pos + bss->len_information_elements;
-
-	while (pos + 1 < end) {
-		if (pos + 2 + pos[1] > end)
-			break;
-		if (pos[0] == ie)
-			return pos;
-		pos += 2 + pos[1];
-	}
-
-	return NULL;
+	return cfg80211_find_ie(ie, bss->information_elements,
+				 bss->len_information_elements);
 }
 EXPORT_SYMBOL(ieee80211_bss_get_ie);