|
@@ -100,10 +100,6 @@ static void _batadv_update_route(struct batadv_priv *bat_priv,
|
|
|
if (curr_router)
|
|
|
batadv_neigh_node_put(curr_router);
|
|
|
|
|
|
- /* increase refcount of new best neighbor */
|
|
|
- if (neigh_node && !kref_get_unless_zero(&neigh_node->refcount))
|
|
|
- neigh_node = NULL;
|
|
|
-
|
|
|
spin_lock_bh(&orig_node->neigh_list_lock);
|
|
|
/* curr_router used earlier may not be the current orig_ifinfo->router
|
|
|
* anymore because it was dereferenced outside of the neigh_list_lock
|
|
@@ -114,6 +110,10 @@ static void _batadv_update_route(struct batadv_priv *bat_priv,
|
|
|
*/
|
|
|
curr_router = rcu_dereference_protected(orig_ifinfo->router, true);
|
|
|
|
|
|
+ /* increase refcount of new best neighbor */
|
|
|
+ if (neigh_node)
|
|
|
+ kref_get(&neigh_node->refcount);
|
|
|
+
|
|
|
rcu_assign_pointer(orig_ifinfo->router, neigh_node);
|
|
|
spin_unlock_bh(&orig_node->neigh_list_lock);
|
|
|
batadv_orig_ifinfo_put(orig_ifinfo);
|