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

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Acked-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 5e93af4cb97f1a9f814fd5bd4742db69977b9402..912d9c36fb1c9e63d1358bd044f5a0218f2f4d77 100644 (file)
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -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;
 

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index d6d9809fee661591c3bcbe077b4ed60ebebf2319..099a84afcd615932f69070675292d6d9bcf57419 100644 (file)
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -444,16 +444,17 @@ out:
 
 /**
  * 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;
 

diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h
index 3fc76f6f710c40e03764c793ffcbe3cfb74ff551..fde34385c62c47ddfacd28edce9c6c3b80f7f3a4 100644 (file)
--- a/net/batman-adv/originator.h
+++ b/net/batman-adv/originator.h
@@ -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,