* [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: drop useless argument seqno in neighbor creation
@ 2013-03-25 12:49 Antonio Quartulli
2013-03-25 12:49 ` [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: slightly improve neighbor creation debug message Antonio Quartulli
2013-04-03 11:03 ` [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: drop useless argument seqno in neighbor creation Marek Lindner
0 siblings, 2 replies; 5+ messages in thread
From: Antonio Quartulli @ 2013-03-25 12:49 UTC (permalink / raw)
To: b.a.t.m.a.n; +Cc: Antonio Quartulli
From: Antonio Quartulli <antonio@open-mesh.com>
the sequence number is not stored in struct neigh_node,
therefore there is no need to pass such value to the
neigh_node creation procedure.
At the moment the value is only used by a debug message, but
given the fact that the seqno is not related to the neighbor
object, it is better to print it elsewhere.
Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
---
do we really want to pass the seqno over every function just to print it at the
end? If this value is really important (debug? don't know) it should be printed
in a proper place, e.g. in the function that triggered the creation and that
possibly has the seqno for other purposes...
Otherwise we would not be able to create a neigh_nod unless we have a seqno to
pass.
Cheers,
bat_iv_ogm.c | 11 ++++-------
originator.c | 5 ++---
originator.h | 2 +-
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index 071f288..da239c5 100644
--- a/bat_iv_ogm.c
+++ b/bat_iv_ogm.c
@@ -33,12 +33,11 @@ static struct batadv_neigh_node *
batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface,
const uint8_t *neigh_addr,
struct batadv_orig_node *orig_node,
- struct batadv_orig_node *orig_neigh, __be32 seqno)
+ struct batadv_orig_node *orig_neigh)
{
struct batadv_neigh_node *neigh_node;
- neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr,
- ntohl(seqno));
+ neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr);
if (!neigh_node)
goto out;
@@ -696,8 +695,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv,
neigh_node = batadv_iv_ogm_neigh_new(if_incoming,
ethhdr->h_source,
- orig_node, orig_tmp,
- batadv_ogm_packet->seqno);
+ orig_node, orig_tmp);
batadv_orig_node_free_ref(orig_tmp);
if (!neigh_node)
@@ -829,8 +827,7 @@ static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,
neigh_node = batadv_iv_ogm_neigh_new(if_incoming,
orig_neigh_node->orig,
orig_neigh_node,
- orig_neigh_node,
- batadv_ogm_packet->seqno);
+ orig_neigh_node);
if (!neigh_node)
goto out;
diff --git a/originator.c b/originator.c
index 2f34525..ddd417c 100644
--- a/originator.c
+++ b/originator.c
@@ -92,7 +92,7 @@ batadv_orig_node_get_router(struct batadv_orig_node *orig_node)
struct batadv_neigh_node *
batadv_neigh_node_new(struct batadv_hard_iface *hard_iface,
- const uint8_t *neigh_addr, uint32_t seqno)
+ const uint8_t *neigh_addr)
{
struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
struct batadv_neigh_node *neigh_node;
@@ -110,8 +110,7 @@ batadv_neigh_node_new(struct batadv_hard_iface *hard_iface,
atomic_set(&neigh_node->refcount, 2);
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
- "Creating new neighbor %pM, initial seqno %d\n",
- neigh_addr, seqno);
+ "Creating new neighbor %pM\n", neigh_addr);
out:
return neigh_node;
diff --git a/originator.h b/originator.h
index 7df48fa..476c623 100644
--- a/originator.h
+++ b/originator.h
@@ -30,7 +30,7 @@ struct batadv_orig_node *batadv_get_orig_node(struct batadv_priv *bat_priv,
const uint8_t *addr);
struct batadv_neigh_node *
batadv_neigh_node_new(struct batadv_hard_iface *hard_iface,
- const uint8_t *neigh_addr, uint32_t seqno);
+ const uint8_t *neigh_addr);
void batadv_neigh_node_free_ref(struct batadv_neigh_node *neigh_node);
struct batadv_neigh_node *
batadv_orig_node_get_router(struct batadv_orig_node *orig_node);
--
1.8.1.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: slightly improve neighbor creation debug message
2013-03-25 12:49 [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: drop useless argument seqno in neighbor creation Antonio Quartulli
@ 2013-03-25 12:49 ` Antonio Quartulli
2013-03-25 12:54 ` [B.A.T.M.A.N.] [PATCHv2 " Antonio Quartulli
2013-04-03 11:03 ` [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: drop useless argument seqno in neighbor creation Marek Lindner
1 sibling, 1 reply; 5+ messages in thread
From: Antonio Quartulli @ 2013-03-25 12:49 UTC (permalink / raw)
To: b.a.t.m.a.n; +Cc: Antonio Quartulli
From: Antonio Quartulli <antonio@open-mesh.com>
print the interface along with the new neighbor mac address
Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
---
originator.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/originator.c b/originator.c
index ddd417c..fc331bc 100644
--- a/originator.c
+++ b/originator.c
@@ -110,7 +110,8 @@ batadv_neigh_node_new(struct batadv_hard_iface *hard_iface,
atomic_set(&neigh_node->refcount, 2);
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
- "Creating new neighbor %pM\n", neigh_addr);
+ "Creating new neighbor %pM on interface %s\n", neigh_addr,
+ hard_iface->net_dev->dev_name);
out:
return neigh_node;
--
1.8.1.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [B.A.T.M.A.N.] [PATCHv2 2/2] batman-adv: slightly improve neighbor creation debug message
2013-03-25 12:49 ` [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: slightly improve neighbor creation debug message Antonio Quartulli
@ 2013-03-25 12:54 ` Antonio Quartulli
2013-04-03 11:05 ` Marek Lindner
0 siblings, 1 reply; 5+ messages in thread
From: Antonio Quartulli @ 2013-03-25 12:54 UTC (permalink / raw)
To: b.a.t.m.a.n; +Cc: Antonio Quartulli
From: Antonio Quartulli <antonio@open-mesh.com>
print the interface along with the new neighbor mac address
Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
---
v2:
- fixed member name
originator.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/originator.c b/originator.c
index ddd417c..e8a54a8 100644
--- a/originator.c
+++ b/originator.c
@@ -110,7 +110,8 @@ batadv_neigh_node_new(struct batadv_hard_iface *hard_iface,
atomic_set(&neigh_node->refcount, 2);
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
- "Creating new neighbor %pM\n", neigh_addr);
+ "Creating new neighbor %pM on interface %s\n", neigh_addr,
+ hard_iface->net_dev->name);
out:
return neigh_node;
--
1.8.1.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: drop useless argument seqno in neighbor creation
2013-03-25 12:49 [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: drop useless argument seqno in neighbor creation Antonio Quartulli
2013-03-25 12:49 ` [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: slightly improve neighbor creation debug message Antonio Quartulli
@ 2013-04-03 11:03 ` Marek Lindner
1 sibling, 0 replies; 5+ messages in thread
From: Marek Lindner @ 2013-04-03 11:03 UTC (permalink / raw)
To: b.a.t.m.a.n; +Cc: Antonio Quartulli
On Monday, March 25, 2013 20:49:46 Antonio Quartulli wrote:
> From: Antonio Quartulli <antonio@open-mesh.com>
>
> the sequence number is not stored in struct neigh_node,
> therefore there is no need to pass such value to the
> neigh_node creation procedure.
>
> At the moment the value is only used by a debug message, but
> given the fact that the seqno is not related to the neighbor
> object, it is better to print it elsewhere.
>
> Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
> ---
>
> do we really want to pass the seqno over every function just to print it at
> the end? If this value is really important (debug? don't know) it should
> be printed in a proper place, e.g. in the function that triggered the
> creation and that possibly has the seqno for other purposes...
> Otherwise we would not be able to create a neigh_nod unless we have a seqno
> to pass.
>
> Cheers,
>
> bat_iv_ogm.c | 11 ++++-------
> originator.c | 5 ++---
> originator.h | 2 +-
> 3 files changed, 7 insertions(+), 11 deletions(-)
Applied in revision 30b5722.
Thanks,
Marek
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCHv2 2/2] batman-adv: slightly improve neighbor creation debug message
2013-03-25 12:54 ` [B.A.T.M.A.N.] [PATCHv2 " Antonio Quartulli
@ 2013-04-03 11:05 ` Marek Lindner
0 siblings, 0 replies; 5+ messages in thread
From: Marek Lindner @ 2013-04-03 11:05 UTC (permalink / raw)
To: b.a.t.m.a.n; +Cc: Antonio Quartulli
On Monday, March 25, 2013 20:54:45 Antonio Quartulli wrote:
> From: Antonio Quartulli <antonio@open-mesh.com>
>
> print the interface along with the new neighbor mac address
>
> Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
> ---
>
> v2:
> - fixed member name
>
> originator.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
Applied in revision ca32543.
Thanks,
Marek
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-04-03 11:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-25 12:49 [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: drop useless argument seqno in neighbor creation Antonio Quartulli
2013-03-25 12:49 ` [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: slightly improve neighbor creation debug message Antonio Quartulli
2013-03-25 12:54 ` [B.A.T.M.A.N.] [PATCHv2 " Antonio Quartulli
2013-04-03 11:05 ` Marek Lindner
2013-04-03 11:03 ` [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: drop useless argument seqno in neighbor creation Marek Lindner
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).