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

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

batman-adv: rearrange batadv_neigh_node_new() arguments to follow convention 



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

net/batman-adv/bat_iv_ogm.c

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, 
{

	struct batadv_neigh_node *neigh_node;



	neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr, orig_node);

	neigh_node = batadv_neigh_node_new(orig_node, hard_iface, neigh_addr);

	if (!neigh_node)

		goto out;

net/batman-adv/originator.c

+4 −3
Original line number Diff line number Diff line
@@ -444,16 +444,17 @@ batadv_neigh_ifinfo_new(struct batadv_neigh_node *neigh, 


/**

 * batadv_neigh_node_new - create and init a new neigh_node object

 * @orig_node: originator object representing the neighbour

 * @hard_iface: the interface where the neighbour is connected to

 * @neigh_addr: the mac address of the neighbour interface

 * @orig_node: originator object representing the neighbour

 *

 * Allocates a new neigh_node object and initialises all the generic fields.

 * Returns the new object or NULL on failure.

 */

struct batadv_neigh_node *

batadv_neigh_node_new(struct batadv_hard_iface *hard_iface,

		      const u8 *neigh_addr, struct batadv_orig_node *orig_node)

batadv_neigh_node_new(struct batadv_orig_node *orig_node,

		      struct batadv_hard_iface *hard_iface,

		      const u8 *neigh_addr)

{

	struct batadv_neigh_node *neigh_node;

net/batman-adv/originator.h

+3 −2
Original line number Diff line number Diff line
@@ -46,8 +46,9 @@ batadv_neigh_node_get(const struct batadv_orig_node *orig_node, 
		      const struct batadv_hard_iface *hard_iface,

		      const u8 *addr);

struct batadv_neigh_node *

batadv_neigh_node_new(struct batadv_hard_iface *hard_iface,

		      const u8 *neigh_addr, struct batadv_orig_node *orig_node);

batadv_neigh_node_new(struct batadv_orig_node *orig_node,

		      struct batadv_hard_iface *hard_iface,

		      const u8 *neigh_addr);

void batadv_neigh_node_free_ref(struct batadv_neigh_node *neigh_node);

struct batadv_neigh_node *

batadv_orig_router_get(struct batadv_orig_node *orig_node,