From: Antonio Quartulli <antonio@meshcoding.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
Marek Lindner <mareklindner@neomailbox.ch>,
Antonio Quartulli <antonio@meshcoding.com>
Subject: [B.A.T.M.A.N.] [PATCH 05/10] batman-adv: rearrange batadv_neigh_node_new() arguments to follow convention
Date: Fri, 28 Aug 2015 11:12:31 +0200 [thread overview]
Message-ID: <1440753156-7808-6-git-send-email-antonio@meshcoding.com> (raw)
In-Reply-To: <1440753156-7808-1-git-send-email-antonio@meshcoding.com>
From: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Acked-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
---
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 5e93af4..912d9c3 100644
--- 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 d6d9809..099a84a 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.5.0
next prev parent reply other threads:[~2015-08-28 9:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-28 9:12 [B.A.T.M.A.N.] pull request: batman-adv 20150828 Antonio Quartulli
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 01/10] batman-adv: move hardif refcount inc to batadv_neigh_node_new() Antonio Quartulli
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 02/10] batman-adv: remove redundant hard_iface assignment Antonio Quartulli
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 03/10] batman-adv: move neigh_node list add into batadv_neigh_node_new() Antonio Quartulli
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 04/10] batman-adv: remove obsolete deleted attribute for gateway node Antonio Quartulli
2015-08-28 9:12 ` Antonio Quartulli [this message]
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 06/10] batman-adv: fix gateway client style issues Antonio Quartulli
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 07/10] batman-adv: Start new development cycle Antonio Quartulli
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 08/10] batman-adv: don't access unregistered net_device object Antonio Quartulli
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 09/10] batman-adv: Add lower layer needed_(head|tail)room to own ones Antonio Quartulli
2015-08-28 9:12 ` [B.A.T.M.A.N.] [PATCH 10/10] batman-adv: turn batadv_neigh_node_get() into local function Antonio Quartulli
2015-08-28 20:44 ` [B.A.T.M.A.N.] pull request: batman-adv 20150828 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440753156-7808-6-git-send-email-antonio@meshcoding.com \
--to=antonio@meshcoding.com \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=mareklindner@neomailbox.ch \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).