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

Commit cd8b78e7 authored by Marek Lindner's avatar Marek Lindner Committed by Antonio Quartulli
Browse files

batman-adv: refactoring API: find generalized name for bat_ogm_init_primary callback 



Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
Signed-off-by: default avatarAntonio Quartulli <ordex@autistici.org>
parent 77af7575

net/batman-adv/bat_iv_ogm.c

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static void bat_iv_ogm_iface_disable(struct hard_iface *hard_iface) 
	hard_iface->packet_buff = NULL;

}



static void bat_iv_ogm_init_primary(struct hard_iface *hard_iface)

static void bat_iv_ogm_primary_iface_set(struct hard_iface *hard_iface)

{

	struct batman_ogm_packet *batman_ogm_packet;
@@ -1191,7 +1191,7 @@ static struct bat_algo_ops batman_iv __read_mostly = { 
	.name = "BATMAN IV",

	.bat_iface_enable = bat_iv_ogm_iface_enable,

	.bat_iface_disable = bat_iv_ogm_iface_disable,

	.bat_ogm_init_primary = bat_iv_ogm_init_primary,

	.bat_primary_iface_set = bat_iv_ogm_primary_iface_set,

	.bat_ogm_update_mac = bat_iv_ogm_update_mac,

	.bat_ogm_schedule = bat_iv_ogm_schedule,

	.bat_ogm_emit = bat_iv_ogm_emit,

net/batman-adv/hard-interface.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static void primary_if_select(struct bat_priv *bat_priv, 
	if (!new_hard_iface)

		goto out;



	bat_priv->bat_algo_ops->bat_ogm_init_primary(new_hard_iface);

	bat_priv->bat_algo_ops->bat_primary_iface_set(new_hard_iface);

	primary_if_update_addr(bat_priv, curr_hard_iface);



out:

net/batman-adv/main.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ int bat_algo_register(struct bat_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_ogm_init_primary ||

	    !bat_algo_ops->bat_primary_iface_set ||

	    !bat_algo_ops->bat_ogm_update_mac ||

	    !bat_algo_ops->bat_ogm_schedule ||

	    !bat_algo_ops->bat_ogm_emit ||

net/batman-adv/types.h

+2 −2
Original line number Diff line number Diff line
@@ -381,8 +381,8 @@ struct bat_algo_ops { 
	int (*bat_iface_enable)(struct hard_iface *hard_iface);

	/* de-init routing info when hard-interface is disabled */

	void (*bat_iface_disable)(struct hard_iface *hard_iface);

	/* init primary OGM when primary interface is selected */

	void (*bat_ogm_init_primary)(struct hard_iface *hard_iface);

	/* called when primary interface is selected / changed */

	void (*bat_primary_iface_set)(struct hard_iface *hard_iface);

	/* init mac addresses of the OGM belonging to this hard-interface */

	void (*bat_ogm_update_mac)(struct hard_iface *hard_iface);

	/* prepare a new outgoing OGM for the send queue */