diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-12-07 13:03:50 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-12-07 13:03:50 -0500 |
| commit | 8024dc191025d6b981563236df02da5c0db0854d (patch) | |
| tree | f42cd84995c804c3590c56616527f5399155060b /net/wireless/util.c | |
| parent | fd3065b25b69ce345073bbd294a73343a608fd8b (diff) | |
| parent | 9e2ff36beae4bedbad2a69d458f9404f35fcb528 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/wireless/util.c')
| -rw-r--r-- | net/wireless/util.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 3cce6e486219..16d76a807c2f 100644 --- 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); |