From 5db0bb21d8fbe772f22b04e89ff2e335977ca88b Mon Sep 17 00:00:00 2001
From: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Date: Wed, 25 Jul 2012 13:56:53 +0300
Subject: [PATCH] --- yaml --- r: 327627 b: refs/heads/master c:
 e21768928d73df55e648869d3ae159475d1e4b7d h: refs/heads/master i:   327625:
 61d422770eb452d8cf5247ddd10117f490ac9d71   327623:
 7a8ec773e6de4189ea71ef9d3a51ca4f15954647 v: v3

---
 [refs]                    |  2 +-
 trunk/net/wireless/util.c | 18 +++---------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index cd442a72a1eb..d478edcfd450 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c7d857c4a4a552d8d3e1b2e24e1864ec2989285
+refs/heads/master: e21768928d73df55e648869d3ae159475d1e4b7d
diff --git a/trunk/net/wireless/util.c b/trunk/net/wireless/util.c
index 26f8cd30f712..ce393dd8c928 100644
--- a/trunk/net/wireless/util.c
+++ b/trunk/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);