diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2011-05-13 14:15:49 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2011-05-16 14:10:41 -0400 |
| commit | 40b275b69ee660274b77fb612b0db31fd282fc3f (patch) | |
| tree | 29a4f82a44a12edcf9db5de6a3c6df9615a5799e /net/mac80211/agg-rx.c | |
| parent | mac80211: fix TX a-MPDU locking (diff) | |
| download | linux-dev-40b275b69ee660274b77fb612b0db31fd282fc3f.tar.xz linux-dev-40b275b69ee660274b77fb612b0db31fd282fc3f.zip | |
mac80211: sparse RCU annotations
This adds sparse RCU annotations to most of
mac80211, only the mesh code remains to be
done.
Due the the previous patches, the annotations
are pretty simple. The only thing that this
actually changes is removing the RCU usage of
key->sta in debugfs since this pointer isn't
actually an RCU-managed pointer (it only has
a single assignment done before the key even
goes live). As that is otherwise harmless, I
decided to make it part of this patch.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/agg-rx.c')
| -rw-r--r-- | net/mac80211/agg-rx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c index 0c9d0c07eae6..9c0d76cdca92 100644 --- 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; |