提交 3f32f8a6 编写于 作者: M Marek Lindner 提交者: Antonio Quartulli

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

Signed-off-by: NMarek Lindner <mareklindner@neomailbox.ch>
Acked-by: NSimon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: NAntonio Quartulli <antonio@meshcoding.com>
上级 bd3524c1
...@@ -298,7 +298,7 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, ...@@ -298,7 +298,7 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface,
{ {
struct batadv_neigh_node *neigh_node; 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) if (!neigh_node)
goto out; goto out;
......
...@@ -444,16 +444,17 @@ batadv_neigh_ifinfo_new(struct batadv_neigh_node *neigh, ...@@ -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 * 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 * @hard_iface: the interface where the neighbour is connected to
* @neigh_addr: the mac address of the neighbour interface * @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. * Allocates a new neigh_node object and initialises all the generic fields.
* Returns the new object or NULL on failure. * Returns the new object or NULL on failure.
*/ */
struct batadv_neigh_node * struct batadv_neigh_node *
batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, batadv_neigh_node_new(struct batadv_orig_node *orig_node,
const u8 *neigh_addr, struct batadv_orig_node *orig_node) struct batadv_hard_iface *hard_iface,
const u8 *neigh_addr)
{ {
struct batadv_neigh_node *neigh_node; struct batadv_neigh_node *neigh_node;
......
...@@ -46,8 +46,9 @@ batadv_neigh_node_get(const struct batadv_orig_node *orig_node, ...@@ -46,8 +46,9 @@ batadv_neigh_node_get(const struct batadv_orig_node *orig_node,
const struct batadv_hard_iface *hard_iface, const struct batadv_hard_iface *hard_iface,
const u8 *addr); const u8 *addr);
struct batadv_neigh_node * struct batadv_neigh_node *
batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, batadv_neigh_node_new(struct batadv_orig_node *orig_node,
const u8 *neigh_addr, 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); void batadv_neigh_node_free_ref(struct batadv_neigh_node *neigh_node);
struct batadv_neigh_node * struct batadv_neigh_node *
batadv_orig_router_get(struct batadv_orig_node *orig_node, batadv_orig_router_get(struct batadv_orig_node *orig_node,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册