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 20:10:41 +0200 |
| commit | 40b275b69ee660274b77fb612b0db31fd282fc3f (patch) | |
| tree | 29a4f82a44a12edcf9db5de6a3c6df9615a5799e /net/mac80211/tx.c | |
| parent | mac80211: fix TX a-MPDU locking (diff) | |
| download | linux-40b275b69ee660274b77fb612b0db31fd282fc3f.tar.xz linux-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/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index c9f12113ca6a..6eeaaa2bbafe 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1147,7 +1147,7 @@ static bool ieee80211_tx_prep_agg(struct ieee80211_tx_data *tx, * packet pass through because splicing the frames * back is already done. */ - tid_tx = tx->sta->ampdu_mlme.tid_tx[tid]; + tid_tx = rcu_dereference_protected_tid_tx(tx->sta, tid); if (!tid_tx) { /* do nothing, let packet pass through */ |