* [B.A.T.M.A.N.] [PATCHv2] batman-adv: rearrange batadv_neigh_node_new() arguments to follow convention
@ 2015-07-25 20:59 Marek Lindner
2015-08-03 18:00 ` Simon Wunderlich
0 siblings, 1 reply; 3+ messages in thread
From: Marek Lindner @ 2015-07-25 20:59 UTC (permalink / raw)
To: b.a.t.m.a.n; +Cc: Marek Lindner
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
v2: Fixing subject line.
net/batman-adv/bat_iv_ogm.c | 2 +-
net/batman-adv/originator.c | 7 ++++---
net/batman-adv/originator.h | 5 +++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index b18184e..60ca3dc 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -299,7 +299,7 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface,
struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
struct batadv_neigh_node *neigh_node, *tmp_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 f8317c1..67d3d8e 100644
--- 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 3fc76f6..fde3438 100644
--- 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,
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCHv2] batman-adv: rearrange batadv_neigh_node_new() arguments to follow convention
2015-07-25 20:59 [B.A.T.M.A.N.] [PATCHv2] batman-adv: rearrange batadv_neigh_node_new() arguments to follow convention Marek Lindner
@ 2015-08-03 18:00 ` Simon Wunderlich
2015-08-03 23:46 ` Marek Lindner
0 siblings, 1 reply; 3+ messages in thread
From: Simon Wunderlich @ 2015-08-03 18:00 UTC (permalink / raw)
To: b.a.t.m.a.n; +Cc: Marek Lindner
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
On Sunday 26 July 2015 04:59:15 Marek Lindner wrote:
> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
> ---
> v2: Fixing subject line.
>
Acked-by: Simon Wunderlich <sw@simonwunderlich.de>
Cheers,
Simon
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCHv2] batman-adv: rearrange batadv_neigh_node_new() arguments to follow convention
2015-08-03 18:00 ` Simon Wunderlich
@ 2015-08-03 23:46 ` Marek Lindner
0 siblings, 0 replies; 3+ messages in thread
From: Marek Lindner @ 2015-08-03 23:46 UTC (permalink / raw)
To: b.a.t.m.a.n
[-- Attachment #1: Type: text/plain, Size: 325 bytes --]
On Monday, August 03, 2015 20:00:13 Simon Wunderlich wrote:
> On Sunday 26 July 2015 04:59:15 Marek Lindner wrote:
> > Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
> > ---
> > v2: Fixing subject line.
> >
> >
>
> Acked-by: Simon Wunderlich <sw@simonwunderlich.de>
Applied in revision a09a26a.
Regards,
Marek
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-08-03 23:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-25 20:59 [B.A.T.M.A.N.] [PATCHv2] batman-adv: rearrange batadv_neigh_node_new() arguments to follow convention Marek Lindner
2015-08-03 18:00 ` Simon Wunderlich
2015-08-03 23:46 ` Marek Lindner
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.