Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/b43legacy/dma.c

1 files changed, 2 insertions, 0 deletions

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 57989a046fca..ecb4c84c1bb3 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1385,9 +1385,11 @@ void ieee80211_beacon_connection_loss_work(struct work_struct *work)
         struct sta_info *sta;
 
         if (ifmgd->associated) {
+                rcu_read_lock();
                 sta = sta_info_get(sdata, ifmgd->bssid);
                 if (sta)
                         sta->beacon_loss_count++;
+                rcu_read_unlock();
         }
 
         if (sdata->local->hw.flags & IEEE80211_HW_CONNECTION_MONITOR)