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

Commit 18165f6f authored by Simon Wunderlich's avatar Simon Wunderlich Committed by Antonio Quartulli
Browse files

batman-adv: rename equiv/equal or better to similar or better 



Since the function applies a threshold and also slightly worse
values are accepted, ''equal or better'' does not represent the
intention of the function. ''Similar or better'' represents that better.

Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarAntonio Quartulli <antonio@meshcoding.com>
parent 4ff1e2a7

net/batman-adv/bat_iv_ogm.c

+4 −4
Original line number Diff line number Diff line
@@ -1964,8 +1964,8 @@ static int batadv_iv_ogm_neigh_cmp(struct batadv_neigh_node *neigh1, 
}



/**

 * batadv_iv_ogm_neigh_is_eob - check if neigh1 is equally good or better than

 *  neigh2 from the metric prospective

 * batadv_iv_ogm_neigh_is_sob - check if neigh1 is similarly good or better

 *  than neigh2 from the metric prospective

 * @neigh1: the first neighbor object of the comparison

 * @if_outgoing1: outgoing interface for the first neighbor

 * @neigh2: the second neighbor object of the comparison
@@ -1975,7 +1975,7 @@ static int batadv_iv_ogm_neigh_cmp(struct batadv_neigh_node *neigh1, 
 * the metric via neigh2, false otherwise.

 */

static bool

batadv_iv_ogm_neigh_is_eob(struct batadv_neigh_node *neigh1,

batadv_iv_ogm_neigh_is_sob(struct batadv_neigh_node *neigh1,

			   struct batadv_hard_iface *if_outgoing1,

			   struct batadv_neigh_node *neigh2,

			   struct batadv_hard_iface *if_outgoing2)
@@ -2015,7 +2015,7 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = { 
	.bat_ogm_schedule = batadv_iv_ogm_schedule,

	.bat_ogm_emit = batadv_iv_ogm_emit,

	.bat_neigh_cmp = batadv_iv_ogm_neigh_cmp,

	.bat_neigh_is_equiv_or_better = batadv_iv_ogm_neigh_is_eob,

	.bat_neigh_is_similar_or_better = batadv_iv_ogm_neigh_is_sob,

	.bat_neigh_print = batadv_iv_neigh_print,

	.bat_orig_print = batadv_iv_ogm_orig_print,

	.bat_orig_free = batadv_iv_ogm_orig_free,

net/batman-adv/main.c

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops) 
	    !bat_algo_ops->bat_ogm_schedule ||

	    !bat_algo_ops->bat_ogm_emit ||

	    !bat_algo_ops->bat_neigh_cmp ||

	    !bat_algo_ops->bat_neigh_is_equiv_or_better) {

	    !bat_algo_ops->bat_neigh_is_similar_or_better) {

		pr_info("Routing algo '%s' does not implement required ops\n",

			bat_algo_ops->name);

		return -EINVAL;

net/batman-adv/routing.c

+3 −3
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ batadv_find_router(struct batadv_priv *bat_priv, 
		/* alternative candidate should be good enough to be

		 * considered

		 */

		if (!bao->bat_neigh_is_equiv_or_better(cand_router,

		if (!bao->bat_neigh_is_similar_or_better(cand_router,

							 cand->if_outgoing,

							 router, recv_if))

			goto next;

net/batman-adv/types.h

+3 −3
Original line number Diff line number Diff line
@@ -1156,8 +1156,8 @@ struct batadv_forw_packet { 
 * @bat_hardif_neigh_init: called on creation of single hop entry

 * @bat_neigh_cmp: compare the metrics of two neighbors for their respective

 *  outgoing interfaces

 * @bat_neigh_is_equiv_or_better: check if neigh1 is equally good or better

 *  than neigh2 for their respective outgoing interface from the metric

 * @bat_neigh_is_similar_or_better: check if neigh1 is equally similar or

 *  better than neigh2 for their respective outgoing interface from the metric

 *  prospective

 * @bat_neigh_print: print the single hop neighbor list (optional)

 * @bat_neigh_free: free the resources allocated by the routing algorithm for a
@@ -1185,7 +1185,7 @@ struct batadv_algo_ops { 
			     struct batadv_hard_iface *if_outgoing1,

			     struct batadv_neigh_node *neigh2,

			     struct batadv_hard_iface *if_outgoing2);

	bool (*bat_neigh_is_equiv_or_better)

	bool (*bat_neigh_is_similar_or_better)

		(struct batadv_neigh_node *neigh1,

		 struct batadv_hard_iface *if_outgoing1,

		 struct batadv_neigh_node *neigh2,