Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / net / wireless / util.c

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 3cce6e486219d369a2e823ff5f741f24d2d4902e..16d76a807c2fac022294aa33cb0336bb89bab38b 100644 (file)
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -688,10 +688,13 @@ EXPORT_SYMBOL(cfg80211_classify8021d);
 
 const u8 *ieee80211_bss_get_ie(struct cfg80211_bss *bss, u8 ie)
 {
-       if (bss->information_elements == NULL)
+       const struct cfg80211_bss_ies *ies;
+
+       ies = rcu_dereference(bss->ies);
+       if (!ies)
                return NULL;
-       return cfg80211_find_ie(ie, bss->information_elements,
-                                bss->len_information_elements);
+
+       return cfg80211_find_ie(ie, ies->data, ies->len);
 }
 EXPORT_SYMBOL(ieee80211_bss_get_ie);