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

Commit 29824a55 authored by Antonio Quartulli's avatar Antonio Quartulli Committed by Simon Wunderlich
Browse files

batman-adv: split routing API data structure in subobjects 



The routing API data structure contains several function
pointers that can easily be grouped together based on the
component they work with.

Split the API in subobjects in order to improve definition readability.

At the same time, remove the "bat_" prefix from the API object and
its fields names. These are batman-adv private structs and there is no
need to always prepend such prefix, which only makes function invocations
much much longer.

Signed-off-by: default avatarAntonio Quartulli <a@unstable.cc>
Reviewed-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent 33a3bb4a

net/batman-adv/bat_algo.c

+7 −7
Original line number Diff line number Diff line
@@ -65,12 +65,12 @@ int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops) 
	}



	/* all algorithms must implement all ops (for now) */

	if (!bat_algo_ops->bat_iface_enable ||

	    !bat_algo_ops->bat_iface_disable ||

	    !bat_algo_ops->bat_iface_update_mac ||

	    !bat_algo_ops->bat_primary_iface_set ||

	    !bat_algo_ops->bat_neigh_cmp ||

	    !bat_algo_ops->bat_neigh_is_similar_or_better) {

	if (!bat_algo_ops->iface.enable ||

	    !bat_algo_ops->iface.disable ||

	    !bat_algo_ops->iface.update_mac ||

	    !bat_algo_ops->iface.primary_set ||

	    !bat_algo_ops->neigh.cmp ||

	    !bat_algo_ops->neigh.is_similar_or_better) {

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

			bat_algo_ops->name);

		return -EINVAL;
@@ -90,7 +90,7 @@ int batadv_algo_select(struct batadv_priv *bat_priv, char *name) 
	if (!bat_algo_ops)

		return -EINVAL;



	bat_priv->bat_algo_ops = bat_algo_ops;

	bat_priv->algo_ops = bat_algo_ops;



	return 0;

}

net/batman-adv/bat_iv_ogm.c

+19 −14
Original line number Diff line number Diff line
@@ -1853,8 +1853,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, 
	/* did we receive a B.A.T.M.A.N. IV OGM packet on an interface

	 * that does not have B.A.T.M.A.N. IV enabled ?

	 */

	if (bat_priv->bat_algo_ops->bat_iface_enable !=

	    batadv_iv_ogm_iface_enable)

	if (bat_priv->algo_ops->iface.enable != batadv_iv_ogm_iface_enable)

		return NET_RX_DROP;



	batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_RX);
@@ -2120,18 +2119,24 @@ static void batadv_iv_iface_activate(struct batadv_hard_iface *hard_iface) 


static struct batadv_algo_ops batadv_batman_iv __read_mostly = {

	.name = "BATMAN_IV",

	.bat_iface_activate = batadv_iv_iface_activate,

	.bat_iface_enable = batadv_iv_ogm_iface_enable,

	.bat_iface_disable = batadv_iv_ogm_iface_disable,

	.bat_iface_update_mac = batadv_iv_ogm_iface_update_mac,

	.bat_primary_iface_set = batadv_iv_ogm_primary_iface_set,

	.bat_neigh_cmp = batadv_iv_ogm_neigh_cmp,

	.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,

	.bat_orig_add_if = batadv_iv_ogm_orig_add_if,

	.bat_orig_del_if = batadv_iv_ogm_orig_del_if,

	.iface = {

		.activate = batadv_iv_iface_activate,

		.enable = batadv_iv_ogm_iface_enable,

		.disable = batadv_iv_ogm_iface_disable,

		.update_mac = batadv_iv_ogm_iface_update_mac,

		.primary_set = batadv_iv_ogm_primary_iface_set,

	},

	.neigh = {

		.cmp = batadv_iv_ogm_neigh_cmp,

		.is_similar_or_better = batadv_iv_ogm_neigh_is_sob,

		.print = batadv_iv_neigh_print,

	},

	.orig = {

		.print = batadv_iv_ogm_orig_print,

		.free = batadv_iv_ogm_orig_free,

		.add_if = batadv_iv_ogm_orig_add_if,

		.del_if = batadv_iv_ogm_orig_del_if,

	},

};



int __init batadv_iv_init(void)

net/batman-adv/bat_v.c

+16 −10
Original line number Diff line number Diff line
@@ -322,16 +322,22 @@ static bool batadv_v_neigh_is_sob(struct batadv_neigh_node *neigh1, 


static struct batadv_algo_ops batadv_batman_v __read_mostly = {

	.name = "BATMAN_V",

	.bat_iface_activate = batadv_v_iface_activate,

	.bat_iface_enable = batadv_v_iface_enable,

	.bat_iface_disable = batadv_v_iface_disable,

	.bat_iface_update_mac = batadv_v_iface_update_mac,

	.bat_primary_iface_set = batadv_v_primary_iface_set,

	.bat_hardif_neigh_init = batadv_v_hardif_neigh_init,

	.bat_orig_print = batadv_v_orig_print,

	.bat_neigh_cmp = batadv_v_neigh_cmp,

	.bat_neigh_is_similar_or_better = batadv_v_neigh_is_sob,

	.bat_neigh_print = batadv_v_neigh_print,

	.iface = {

		.activate = batadv_v_iface_activate,

		.enable = batadv_v_iface_enable,

		.disable = batadv_v_iface_disable,

		.update_mac = batadv_v_iface_update_mac,

		.primary_set = batadv_v_primary_iface_set,

	},

	.neigh = {

		.hardif_init = batadv_v_hardif_neigh_init,

		.cmp = batadv_v_neigh_cmp,

		.is_similar_or_better = batadv_v_neigh_is_sob,

		.print = batadv_v_neigh_print,

	},

	.orig = {

		.print = batadv_v_orig_print,

	},

};



/**

net/batman-adv/bat_v_elp.c

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ int batadv_v_elp_packet_recv(struct sk_buff *skb, 
	/* did we receive a B.A.T.M.A.N. V ELP packet on an interface

	 * that does not have B.A.T.M.A.N. V ELP enabled ?

	 */

	if (strcmp(bat_priv->bat_algo_ops->name, "BATMAN_V") != 0)

	if (strcmp(bat_priv->algo_ops->name, "BATMAN_V") != 0)

		return NET_RX_DROP;



	elp_packet = (struct batadv_elp_packet *)skb->data;

net/batman-adv/bat_v_ogm.c

+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ int batadv_v_ogm_packet_recv(struct sk_buff *skb, 
	/* did we receive a OGM2 packet on an interface that does not have

	 * B.A.T.M.A.N. V enabled ?

	 */

	if (strcmp(bat_priv->bat_algo_ops->name, "BATMAN_V") != 0)

	if (strcmp(bat_priv->algo_ops->name, "BATMAN_V") != 0)

		return NET_RX_DROP;



	if (!batadv_check_management_packet(skb, if_incoming, BATADV_OGM2_HLEN))