From ff4d07a806a963b503bda7311ac23d35d053abe9 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Sun, 15 May 2011 00:50:21 +0200 Subject: [PATCH] --- yaml --- r: 255308 b: refs/heads/master c: 728cbc6ac1eef89660875c70a602c1a0ba8df4ff h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/batman-adv/gateway_client.c | 2 +- trunk/net/batman-adv/hard-interface.c | 2 +- trunk/net/batman-adv/soft-interface.c | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 927678734508..68cfef91d960 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 704509b8d44886cebfbaff1a9813c35dfa986954 +refs/heads/master: 728cbc6ac1eef89660875c70a602c1a0ba8df4ff diff --git a/trunk/net/batman-adv/gateway_client.c b/trunk/net/batman-adv/gateway_client.c index a44dff3efb7f..ab597c4f9ddd 100644 --- a/trunk/net/batman-adv/gateway_client.c +++ b/trunk/net/batman-adv/gateway_client.c @@ -86,7 +86,7 @@ static void gw_select(struct bat_priv *bat_priv, struct gw_node *new_gw_node) if (new_gw_node && !atomic_inc_not_zero(&new_gw_node->refcount)) new_gw_node = NULL; - curr_gw_node = bat_priv->curr_gw; + curr_gw_node = rcu_dereference_protected(bat_priv->curr_gw, 1); rcu_assign_pointer(bat_priv->curr_gw, new_gw_node); if (curr_gw_node) diff --git a/trunk/net/batman-adv/hard-interface.c b/trunk/net/batman-adv/hard-interface.c index e0052cf389db..a3fbfb5c92f1 100644 --- a/trunk/net/batman-adv/hard-interface.c +++ b/trunk/net/batman-adv/hard-interface.c @@ -138,7 +138,7 @@ static void primary_if_select(struct bat_priv *bat_priv, if (new_hard_iface && !atomic_inc_not_zero(&new_hard_iface->refcount)) new_hard_iface = NULL; - curr_hard_iface = bat_priv->primary_if; + curr_hard_iface = rcu_dereference_protected(bat_priv->primary_if, 1); rcu_assign_pointer(bat_priv->primary_if, new_hard_iface); if (curr_hard_iface) diff --git a/trunk/net/batman-adv/soft-interface.c b/trunk/net/batman-adv/soft-interface.c index cead606008a1..b8d3f248efdc 100644 --- a/trunk/net/batman-adv/soft-interface.c +++ b/trunk/net/batman-adv/soft-interface.c @@ -241,7 +241,8 @@ static void softif_neigh_vid_select(struct bat_priv *bat_priv, if (new_neigh && !atomic_inc_not_zero(&new_neigh->refcount)) new_neigh = NULL; - curr_neigh = softif_neigh_vid->softif_neigh; + curr_neigh = rcu_dereference_protected(softif_neigh_vid->softif_neigh, + 1); rcu_assign_pointer(softif_neigh_vid->softif_neigh, new_neigh); if ((curr_neigh) && (!new_neigh))