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

Commit 5d967310 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Rename batadv_orig_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 e9ccd7e3

net/batman-adv/bat_iv_ogm.c

+8 −8
Original line number Diff line number Diff line
@@ -287,8 +287,8 @@ batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const u8 *addr) 


free_orig_node:

	/* free twice, as batadv_orig_node_new sets refcount to 2 */

	batadv_orig_node_free_ref(orig_node);

	batadv_orig_node_free_ref(orig_node);

	batadv_orig_node_put(orig_node);

	batadv_orig_node_put(orig_node);



	return NULL;

}
@@ -1041,7 +1041,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, 
						     ethhdr->h_source,

						     orig_node, orig_tmp);



		batadv_orig_node_free_ref(orig_tmp);

		batadv_orig_node_put(orig_tmp);

		if (!neigh_node)

			goto unlock;

	} else {
@@ -1306,7 +1306,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, 


	orig_ifinfo = batadv_orig_ifinfo_new(orig_node, if_outgoing);

	if (WARN_ON(!orig_ifinfo)) {

		batadv_orig_node_free_ref(orig_node);

		batadv_orig_node_put(orig_node);

		return 0;

	}
@@ -1367,7 +1367,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, 


out:

	spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock);

	batadv_orig_node_free_ref(orig_node);

	batadv_orig_node_put(orig_node);

	batadv_orig_ifinfo_free_ref(orig_ifinfo);

	return ret;

}
@@ -1563,7 +1563,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, 


out_neigh:

	if ((orig_neigh_node) && (!is_single_hop_neigh))

		batadv_orig_node_free_ref(orig_neigh_node);

		batadv_orig_node_put(orig_neigh_node);

out:

	if (router_ifinfo)

		batadv_neigh_ifinfo_free_ref(router_ifinfo);
@@ -1697,7 +1697,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, 


		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "Drop packet: originator packet from myself (via neighbor)\n");

		batadv_orig_node_free_ref(orig_neigh_node);

		batadv_orig_node_put(orig_neigh_node);

		return;

	}
@@ -1735,7 +1735,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, 
	}

	rcu_read_unlock();



	batadv_orig_node_free_ref(orig_node);

	batadv_orig_node_put(orig_node);

}



static int batadv_iv_ogm_receive(struct sk_buff *skb,

net/batman-adv/bridge_loop_avoidance.c

+2 −2
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, u8 *orig, 
	if (orig_node) {

		batadv_tt_global_del_orig(bat_priv, orig_node, vid,

					  "became a backbone gateway");

		batadv_orig_node_free_ref(orig_node);

		batadv_orig_node_put(orig_node);

	}



	if (own_backbone) {
@@ -965,7 +965,7 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv, 
		bla_dst_own->group = bla_dst->group;

	}



	batadv_orig_node_free_ref(orig_node);

	batadv_orig_node_put(orig_node);



	return 2;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv, 


			max = tmp_max;

			if (max_orig_node)

				batadv_orig_node_free_ref(max_orig_node);

				batadv_orig_node_put(max_orig_node);

			max_orig_node = orig_node;

		}

		rcu_read_unlock();
@@ -676,7 +676,7 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv, 
free_neigh:

		batadv_neigh_node_free_ref(neigh_node);

free_orig:

		batadv_orig_node_free_ref(cand[i].orig_node);

		batadv_orig_node_put(cand[i].orig_node);

	}



out:

net/batman-adv/fragmentation.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb, 


out:

	if (orig_node_dst)

		batadv_orig_node_free_ref(orig_node_dst);

		batadv_orig_node_put(orig_node_dst);

	if (neigh_node)

		batadv_neigh_node_free_ref(neigh_node);

	return ret;

net/batman-adv/gateway_client.c

+4 −4
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static void batadv_gw_node_release(struct kref *ref) 


	gw_node = container_of(ref, struct batadv_gw_node, refcount);



	batadv_orig_node_free_ref(gw_node->orig_node);

	batadv_orig_node_put(gw_node->orig_node);

	kfree_rcu(gw_node, rcu);

}
@@ -415,7 +415,7 @@ void batadv_gw_check_election(struct batadv_priv *bat_priv, 
	batadv_gw_reselect(bat_priv);

out:

	if (curr_gw_orig)

		batadv_orig_node_free_ref(curr_gw_orig);

		batadv_orig_node_put(curr_gw_orig);

	if (router_gw)

		batadv_neigh_node_free_ref(router_gw);

	if (router_orig)
@@ -446,7 +446,7 @@ static void batadv_gw_node_add(struct batadv_priv *bat_priv, 


	gw_node = kzalloc(sizeof(*gw_node), GFP_ATOMIC);

	if (!gw_node) {

		batadv_orig_node_free_ref(orig_node);

		batadv_orig_node_put(orig_node);

		return;

	}
@@ -879,7 +879,7 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, 


out:

	if (orig_dst_node)

		batadv_orig_node_free_ref(orig_dst_node);

		batadv_orig_node_put(orig_dst_node);

	if (curr_gw)

		batadv_gw_node_free_ref(curr_gw);

	if (gw_node)