diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2010-04-06 11:18:42 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-04-06 15:53:30 -0400 |
commit | 0379185b6c0d1e8252023698cf1091da92a3dc03 (patch) | |
tree | f4dfe150ef44b2b94d94c982f8bddf9c44c4294d /net/mac80211/main.c | |
parent | 1cb561f83793191cf86a2db3948d28f5f42df9ff (diff) | |
download | op-kernel-dev-0379185b6c0d1e8252023698cf1091da92a3dc03.zip op-kernel-dev-0379185b6c0d1e8252023698cf1091da92a3dc03.tar.gz |
mac80211: annotate station rcu dereferences
The new RCU lockdep support warns about these
in some contexts -- make it aware of the locks
used to protect all this. Different locks are
used in different contexts which unfortunately
means we can't get perfect checking.
Also remove rcu_dereference() from two places
that don't actually dereference the pointers.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r-- | net/mac80211/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 06c33b6..b887e48 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -225,11 +225,11 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata, switch (sdata->vif.type) { case NL80211_IFTYPE_AP: sdata->vif.bss_conf.enable_beacon = - !!rcu_dereference(sdata->u.ap.beacon); + !!sdata->u.ap.beacon; break; case NL80211_IFTYPE_ADHOC: sdata->vif.bss_conf.enable_beacon = - !!rcu_dereference(sdata->u.ibss.presp); + !!sdata->u.ibss.presp; break; case NL80211_IFTYPE_MESH_POINT: sdata->vif.bss_conf.enable_beacon = true; |