Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[deliverable/linux.git] / net / batman-adv / gateway_client.c

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index c59aff5ccac8a63f191a669eafcfdba7a270fd75..5839c569f769ef7137fca9b92915799b78e21123 100644 (file)
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -135,8 +135,8 @@ static void batadv_gw_select(struct batadv_priv *bat_priv,
 
        spin_lock_bh(&bat_priv->gw.list_lock);
 
-       if (new_gw_node && !kref_get_unless_zero(&new_gw_node->refcount))
-               new_gw_node = NULL;
+       if (new_gw_node)
+               kref_get(&new_gw_node->refcount);
 
        curr_gw_node = rcu_dereference_protected(bat_priv->gw.curr_gw, 1);
        rcu_assign_pointer(bat_priv->gw.curr_gw, new_gw_node);
@@ -440,15 +440,11 @@ static void batadv_gw_node_add(struct batadv_priv *bat_priv,
        if (gateway->bandwidth_down == 0)
                return;
 
-       if (!kref_get_unless_zero(&orig_node->refcount))
-               return;
-
        gw_node = kzalloc(sizeof(*gw_node), GFP_ATOMIC);
-       if (!gw_node) {
-               batadv_orig_node_put(orig_node);
+       if (!gw_node)
                return;
-       }
 
+       kref_get(&orig_node->refcount);
        INIT_HLIST_NODE(&gw_node->list);
        gw_node->orig_node = orig_node;
        gw_node->bandwidth_down = ntohl(gateway->bandwidth_down);