Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0

[firefly-linux-kernel-4.4.55.git] / net / mac80211 / agg-rx.c

diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c
index 0c9d0c07eae6cae6ffc6f3ef1f0e91ae64107e2b..9c0d76cdca920ed3b322c4b70ed86f044b4a404b 100644 (file)
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@ -63,7 +63,8 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
 
        lockdep_assert_held(&sta->ampdu_mlme.mtx);
 
-       tid_rx = sta->ampdu_mlme.tid_rx[tid];
+       tid_rx = rcu_dereference_protected(sta->ampdu_mlme.tid_rx[tid],
+                                       lockdep_is_held(&sta->ampdu_mlme.mtx));
 
        if (!tid_rx)
                return;