mac80211: move some RCU locking into an if branch

[linux-2.6-omap-h63xx.git] / net / mac80211 / mlme.c

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index df12e746b03e24d5988ca99a85b85888adae205f..0abd5a4fe38d746c5ad94f647e00e3715f1df4e7 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2612,13 +2612,12 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                                      mesh_peer_accepts_plinks(elems));
        }
 
-       rcu_read_lock();
-
        if (sdata->vif.type == IEEE80211_IF_TYPE_IBSS && elems->supp_rates &&
            memcmp(mgmt->bssid, sdata->u.sta.bssid, ETH_ALEN) == 0) {
-
                supp_rates = ieee80211_sta_get_rates(local, elems, band);
 
+               rcu_read_lock();
+
                sta = sta_info_get(local, mgmt->sa);
                if (sta) {
                        u64 prev_rates;
@@ -2642,9 +2641,9 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                        ieee80211_ibss_add_sta(sdata, NULL, mgmt->bssid,
                                               mgmt->sa, supp_rates);
                }
-       }
 
-       rcu_read_unlock();
+               rcu_read_unlock();
+       }
 
        if (elems->ds_params && elems->ds_params_len == 1)
                freq = ieee80211_channel_to_frequency(elems->ds_params[0]);