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

Commit c2aca022 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 callback 



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

net/batman-adv/bat_iv_ogm.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "send.h"

#include "send.h"

#include "bat_algo.h"

#include "bat_algo.h"





static void bat_iv_ogm_init(struct hard_iface *hard_iface)

static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface)

{

{

	struct batman_ogm_packet *batman_ogm_packet;

	struct batman_ogm_packet *batman_ogm_packet;
@@ -1169,7 +1169,7 @@ static void bat_iv_ogm_receive(struct hard_iface *if_incoming, 




static struct bat_algo_ops batman_iv __read_mostly = {

static struct bat_algo_ops batman_iv __read_mostly = {

	.name = "BATMAN IV",

	.name = "BATMAN IV",

	.bat_ogm_init = bat_iv_ogm_init,

	.bat_iface_enable = bat_iv_ogm_iface_enable,

	.bat_ogm_init_primary = bat_iv_ogm_init_primary,

	.bat_ogm_init_primary = bat_iv_ogm_init_primary,

	.bat_ogm_update_mac = bat_iv_ogm_update_mac,

	.bat_ogm_update_mac = bat_iv_ogm_update_mac,

	.bat_ogm_schedule = bat_iv_ogm_schedule,

	.bat_ogm_schedule = bat_iv_ogm_schedule,

net/batman-adv/hard-interface.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -312,7 +312,7 @@ int hardif_enable_interface(struct hard_iface *hard_iface, 
	hard_iface->soft_iface = soft_iface;

	hard_iface->soft_iface = soft_iface;

	bat_priv = netdev_priv(hard_iface->soft_iface);

	bat_priv = netdev_priv(hard_iface->soft_iface);





	bat_priv->bat_algo_ops->bat_ogm_init(hard_iface);

	bat_priv->bat_algo_ops->bat_iface_enable(hard_iface);





	if (!hard_iface->packet_buff) {

	if (!hard_iface->packet_buff) {

		bat_err(hard_iface->soft_iface,

		bat_err(hard_iface->soft_iface,

net/batman-adv/main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -208,7 +208,7 @@ int bat_algo_register(struct bat_algo_ops *bat_algo_ops) 
	}

	}





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

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

	if (!bat_algo_ops->bat_ogm_init ||

	if (!bat_algo_ops->bat_iface_enable ||

	    !bat_algo_ops->bat_ogm_init_primary ||

	    !bat_algo_ops->bat_ogm_init_primary ||

	    !bat_algo_ops->bat_ogm_update_mac ||

	    !bat_algo_ops->bat_ogm_update_mac ||

	    !bat_algo_ops->bat_ogm_schedule ||

	    !bat_algo_ops->bat_ogm_schedule ||

net/batman-adv/types.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -377,8 +377,8 @@ struct recvlist_node { 
struct bat_algo_ops {

struct bat_algo_ops {

	struct hlist_node list;

	struct hlist_node list;

	char *name;

	char *name;

	/* init OGM when hard-interface is enabled */

	/* init routing info when hard-interface is enabled */

	void (*bat_ogm_init)(struct hard_iface *hard_iface);

	void (*bat_iface_enable)(struct hard_iface *hard_iface);

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

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

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

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

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

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