2012-07-25 10:57:08

by Vladimir Kondratiev

Subject: [PATCH v1] cfg80211: unify IE search

Remove ah-hock IE search code found in the ieee80211_bss_get_ie()
Use cfg80211_find_ie() instead.

Signed-off-by: Vladimir Kondratiev <[email protected]>
---
net/wireless/util.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 26f8cd3..ce393dd 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);

--
1.7.9.5

2012-07-26 17:54:03

by Johannes Berg

Subject: Re: [PATCH v1] cfg80211: unify IE search

On Wed, 2012-07-25 at 13:56 +0300, Vladimir Kondratiev wrote:
> Remove ah-hock IE search code found in the ieee80211_bss_get_ie()
> Use cfg80211_find_ie() instead.

Applied, thanks.

johannes