Merge tag 'docs-5.15' of git://git.lwn.net/linux

[linux-2.6-microblaze.git] / net / batman-adv / routing.c

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index bb9e93e..970d0d7 100644 (file)
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -101,8 +101,7 @@ static void _batadv_update_route(struct batadv_priv *bat_priv,
        }
 
        /* decrease refcount of previous best neighbor */
-       if (curr_router)
-               batadv_neigh_node_put(curr_router);
+       batadv_neigh_node_put(curr_router);
 }
 
 /**
@@ -128,8 +127,7 @@ void batadv_update_route(struct batadv_priv *bat_priv,
                _batadv_update_route(bat_priv, orig_node, recv_if, neigh_node);
 
 out:
-       if (router)
-               batadv_neigh_node_put(router);
+       batadv_neigh_node_put(router);
 }
 
 /**
@@ -269,10 +267,8 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv,
                goto out;
        }
 out:
-       if (primary_if)
-               batadv_hardif_put(primary_if);
-       if (orig_node)
-               batadv_orig_node_put(orig_node);
+       batadv_hardif_put(primary_if);
+       batadv_orig_node_put(orig_node);
 
        kfree_skb(skb);
 
@@ -324,10 +320,8 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv,
        skb = NULL;
 
 out:
-       if (primary_if)
-               batadv_hardif_put(primary_if);
-       if (orig_node)
-               batadv_orig_node_put(orig_node);
+       batadv_hardif_put(primary_if);
+       batadv_orig_node_put(orig_node);
 
        kfree_skb(skb);
 
@@ -425,8 +419,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb,
        skb = NULL;
 
 put_orig_node:
-       if (orig_node)
-               batadv_orig_node_put(orig_node);
+       batadv_orig_node_put(orig_node);
 free_skb:
        kfree_skb(skb);
 
@@ -513,8 +506,7 @@ batadv_last_bonding_replace(struct batadv_orig_node *orig_node,
        orig_node->last_bonding_candidate = new_candidate;
        spin_unlock_bh(&orig_node->neigh_list_lock);
 
-       if (old_candidate)
-               batadv_orig_ifinfo_put(old_candidate);
+       batadv_orig_ifinfo_put(old_candidate);
 }
 
 /**
@@ -656,8 +648,7 @@ next:
                batadv_orig_ifinfo_put(next_candidate);
        }
 
-       if (last_candidate)
-               batadv_orig_ifinfo_put(last_candidate);
+       batadv_orig_ifinfo_put(last_candidate);
 
        return router;
 }
@@ -785,10 +776,8 @@ batadv_reroute_unicast_packet(struct batadv_priv *bat_priv, struct sk_buff *skb,
 
        ret = true;
 out:
-       if (primary_if)
-               batadv_hardif_put(primary_if);
-       if (orig_node)
-               batadv_orig_node_put(orig_node);
+       batadv_hardif_put(primary_if);
+       batadv_orig_node_put(orig_node);
 
        return ret;
 }
@@ -1031,8 +1020,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb,
                                    orig_node);
 
 rx_success:
-               if (orig_node)
-                       batadv_orig_node_put(orig_node);
+               batadv_orig_node_put(orig_node);
 
                return NET_RX_SUCCESS;
        }
@@ -1279,7 +1267,6 @@ free_skb:
        kfree_skb(skb);
        ret = NET_RX_DROP;
 out:
-       if (orig_node)
-               batadv_orig_node_put(orig_node);
+       batadv_orig_node_put(orig_node);
        return ret;
 }