diff options
| author | Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> | 2012-07-25 13:56:53 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-31 16:11:01 +0200 |
| commit | e21768928d73df55e648869d3ae159475d1e4b7d (patch) | |
| tree | 7522ea8a477cc9d012629df3e0c1e6a1a1a54e4a | |
| parent | 8c7d857c4a4a552d8d3e1b2e24e1864ec2989285 (diff) | |
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>
| -rw-r--r-- | net/wireless/util.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 26f8cd30f712..ce393dd8c928 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); |