Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25bb2509 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Rename batadv_neigh_node *_free_ref function to *_put 



The batman-adv source code is the only place in the kernel which uses the
*_free_ref naming scheme for the *_put functions. Changing it to *_put
makes it more consistent and makes it easier to understand the connection
to the *_get functions.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarAntonio Quartulli <a@unstable.cc>
parent 82047ad7

net/batman-adv/bat_iv_ogm.c

+8 −8
Original line number Diff line number Diff line
@@ -1005,7 +1005,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, 
		    tmp_neigh_node->if_incoming == if_incoming &&

		    kref_get_unless_zero(&tmp_neigh_node->refcount)) {

			if (WARN(neigh_node, "too many matching neigh_nodes"))

				batadv_neigh_node_free_ref(neigh_node);

				batadv_neigh_node_put(neigh_node);

			neigh_node = tmp_neigh_node;

			continue;

		}
@@ -1116,9 +1116,9 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, 
	rcu_read_unlock();

out:

	if (neigh_node)

		batadv_neigh_node_free_ref(neigh_node);

		batadv_neigh_node_put(neigh_node);

	if (router)

		batadv_neigh_node_free_ref(router);

		batadv_neigh_node_put(router);

	if (neigh_ifinfo)

		batadv_neigh_ifinfo_free_ref(neigh_ifinfo);

	if (router_ifinfo)
@@ -1265,7 +1265,7 @@ static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, 


out:

	if (neigh_node)

		batadv_neigh_node_free_ref(neigh_node);

		batadv_neigh_node_put(neigh_node);

	return ret;

}
@@ -1568,11 +1568,11 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, 
	if (router_ifinfo)

		batadv_neigh_ifinfo_free_ref(router_ifinfo);

	if (router)

		batadv_neigh_node_free_ref(router);

		batadv_neigh_node_put(router);

	if (router_router)

		batadv_neigh_node_free_ref(router_router);

		batadv_neigh_node_put(router_router);

	if (orig_neigh_router)

		batadv_neigh_node_free_ref(orig_neigh_router);

		batadv_neigh_node_put(orig_neigh_router);

	if (hardif_neigh)

		batadv_hardif_neigh_free_ref(hardif_neigh);
@@ -1868,7 +1868,7 @@ static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv, 
			batman_count++;



next:

			batadv_neigh_node_free_ref(neigh_node);

			batadv_neigh_node_put(neigh_node);

			if (n_ifinfo)

				batadv_neigh_ifinfo_free_ref(n_ifinfo);

		}

net/batman-adv/distributed-arp-table.c

+1 −1
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv, 
			ret = true;

		}

free_neigh:

		batadv_neigh_node_free_ref(neigh_node);

		batadv_neigh_node_put(neigh_node);

free_orig:

		batadv_orig_node_put(cand[i].orig_node);

	}

net/batman-adv/fragmentation.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb, 
	if (orig_node_dst)

		batadv_orig_node_put(orig_node_dst);

	if (neigh_node)

		batadv_neigh_node_free_ref(neigh_node);

		batadv_neigh_node_put(neigh_node);

	return ret;

}

net/batman-adv/gateway_client.c

+7 −7
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv) 
		batadv_gw_node_free_ref(gw_node);



next:

		batadv_neigh_node_free_ref(router);

		batadv_neigh_node_put(router);

		if (router_ifinfo)

			batadv_neigh_ifinfo_free_ref(router_ifinfo);

	}
@@ -352,7 +352,7 @@ void batadv_gw_election(struct batadv_priv *bat_priv) 
	if (next_gw)

		batadv_gw_node_free_ref(next_gw);

	if (router)

		batadv_neigh_node_free_ref(router);

		batadv_neigh_node_put(router);

	if (router_ifinfo)

		batadv_neigh_ifinfo_free_ref(router_ifinfo);

}
@@ -417,9 +417,9 @@ void batadv_gw_check_election(struct batadv_priv *bat_priv, 
	if (curr_gw_orig)

		batadv_orig_node_put(curr_gw_orig);

	if (router_gw)

		batadv_neigh_node_free_ref(router_gw);

		batadv_neigh_node_put(router_gw);

	if (router_orig)

		batadv_neigh_node_free_ref(router_orig);

		batadv_neigh_node_put(router_orig);

	if (router_gw_tq)

		batadv_neigh_ifinfo_free_ref(router_gw_tq);

	if (router_orig_tq)
@@ -626,7 +626,7 @@ static int batadv_write_buffer_text(struct batadv_priv *bat_priv, 
	if (router_ifinfo)

		batadv_neigh_ifinfo_free_ref(router_ifinfo);

	if (router)

		batadv_neigh_node_free_ref(router);

		batadv_neigh_node_put(router);

	return ret;

}
@@ -885,8 +885,8 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, 
	if (gw_node)

		batadv_gw_node_free_ref(gw_node);

	if (neigh_old)

		batadv_neigh_node_free_ref(neigh_old);

		batadv_neigh_node_put(neigh_old);

	if (neigh_curr)

		batadv_neigh_node_free_ref(neigh_curr);

		batadv_neigh_node_put(neigh_curr);

	return out_of_range;

}

net/batman-adv/icmp_socket.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, 
	if (primary_if)

		batadv_hardif_put(primary_if);

	if (neigh_node)

		batadv_neigh_node_free_ref(neigh_node);

		batadv_neigh_node_put(neigh_node);

	if (orig_node)

		batadv_orig_node_put(orig_node);

	return len;