aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/soft-interface.c
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2011-05-14 18:50:21 -0400
committerSven Eckelmann <sven@narfation.org>2011-05-30 01:39:34 -0400
commit728cbc6ac1eef89660875c70a602c1a0ba8df4ff (patch)
treefcdf37937b1f01494400a0e8d57490360c64cdc3 /net/batman-adv/soft-interface.c
parent704509b8d44886cebfbaff1a9813c35dfa986954 (diff)
batman-adv: Use rcu_dereference_protected by update-side
Usually rcu_dereference isn't necessary in situations were the RCU-protected data structure cannot change, but sparse and lockdep still need a similar functionality for analysis. rcu_dereference_protected implements the reduced version which should be used to support the dynamic and static analysis. Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/soft-interface.c')
-rw-r--r--net/batman-adv/soft-interface.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index cead606008a1..b8d3f248efdc 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -241,7 +241,8 @@ static void softif_neigh_vid_select(struct bat_priv *bat_priv,
241 if (new_neigh && !atomic_inc_not_zero(&new_neigh->refcount)) 241 if (new_neigh && !atomic_inc_not_zero(&new_neigh->refcount))
242 new_neigh = NULL; 242 new_neigh = NULL;
243 243
244 curr_neigh = softif_neigh_vid->softif_neigh; 244 curr_neigh = rcu_dereference_protected(softif_neigh_vid->softif_neigh,
245 1);
245 rcu_assign_pointer(softif_neigh_vid->softif_neigh, new_neigh); 246 rcu_assign_pointer(softif_neigh_vid->softif_neigh, new_neigh);
246 247
247 if ((curr_neigh) && (!new_neigh)) 248 if ((curr_neigh) && (!new_neigh))