[B.A.T.M.A.N.] [PATCH v2] batman-adv: remove duplicate code from function is_bidirectional_neigh()
Is there an error in the previous version. I'm sorry, this version instead works for me.
Signed-off-by: Daniele Furlan daniele.furlan@gmail.com --- routing.c | 75 ++++++++++++++++++++---------------------------------------- 1 files changed, 25 insertions(+), 50 deletions(-)
diff --git a/routing.c b/routing.c index 49f5715..c5dec8c 100644 --- a/routing.c +++ b/routing.c @@ -169,65 +169,40 @@ static int is_bidirectional_neigh(struct orig_node *orig_node, uint8_t orig_eq_count, neigh_rq_count, tq_own; int tq_asym_penalty, ret = 0;
- if (orig_node == orig_neigh_node) { - rcu_read_lock(); - hlist_for_each_entry_rcu(tmp_neigh_node, node, - &orig_node->neigh_list, list) { + /* find corresponding one hop neighbor */ + rcu_read_lock(); + hlist_for_each_entry_rcu(tmp_neigh_node, node, + &orig_neigh_node->neigh_list, list) {
- if (!compare_eth(tmp_neigh_node->addr, - orig_neigh_node->orig)) - continue; + if (!compare_eth(tmp_neigh_node->addr, + orig_neigh_node->orig)) + continue;
- if (tmp_neigh_node->if_incoming != if_incoming) - continue; + if (tmp_neigh_node->if_incoming != if_incoming) + continue;
- if (!atomic_inc_not_zero(&tmp_neigh_node->refcount)) - continue; + if (!atomic_inc_not_zero(&tmp_neigh_node->refcount)) + continue;
- neigh_node = tmp_neigh_node; - } - rcu_read_unlock(); + neigh_node = tmp_neigh_node; + } + rcu_read_unlock();
- if (!neigh_node) - neigh_node = create_neighbor(orig_node, - orig_neigh_node, - orig_neigh_node->orig, - if_incoming); - if (!neigh_node) - goto out; + if (!neigh_node) + neigh_node = create_neighbor(orig_neigh_node, + orig_neigh_node, + orig_neigh_node->orig, + if_incoming); + if (!neigh_node) + goto out;
+ /* if orig_node is direct neighbour update neigh_node last_valid */ + if (orig_node == orig_neigh_node) neigh_node->last_valid = jiffies; - } else { - /* find packet count of corresponding one hop neighbor */ - rcu_read_lock(); - hlist_for_each_entry_rcu(tmp_neigh_node, node, - &orig_neigh_node->neigh_list, list) { - - if (!compare_eth(tmp_neigh_node->addr, - orig_neigh_node->orig)) - continue; - - if (tmp_neigh_node->if_incoming != if_incoming) - continue; - - if (!atomic_inc_not_zero(&tmp_neigh_node->refcount)) - continue; - - neigh_node = tmp_neigh_node; - } - rcu_read_unlock(); - - if (!neigh_node) - neigh_node = create_neighbor(orig_neigh_node, - orig_neigh_node, - orig_neigh_node->orig, - if_incoming); - if (!neigh_node) - goto out; - }
orig_node->last_valid = jiffies;
+ /* find packet count of corresponding one hop neighbor */ spin_lock_bh(&orig_node->ogm_cnt_lock); orig_eq_count = orig_neigh_node->bcast_own_sum[if_incoming->if_num]; neigh_rq_count = neigh_node->real_packet_count; -- 1.7.1
Daniele Furlan wrote:
Is there an error in the previous version. I'm sorry, this version instead works for me.
Signed-off-by: Daniele Furlan daniele.furlan@gmail.com
Could you please send a patch which isn't malformed... please :)
The biggest problem seems to be the gmail client. Please use something else like git-send-email (or anything else which doesn't play around with the stuff you gave him) and read through http://www.open-mesh.org/wiki/open-mesh/Contribute#Submitting-patches
Also add a real commit message and only add additional comments after the "---" (right before the diffstats).
Kind regards, Sven
From: Daniele Furlan daniele.furlan@gmail.com
In function is_bidirectional_neigh the code that find out the one hop neighbor is duplicated.
Signed-off-by: Daniele Furlan daniele.furlan@gmail.com Signed-off-by: Sven Eckelmann sven@narfation.org --- No answer yet, but I would like to get this patch into net-next-2.6. I did the change myself and compared both versions by ignoring spaces. No real differences were shown... so I would say that this change looks good :)
routing.c | 73 ++++++++++++++++++++----------------------------------------- 1 files changed, 24 insertions(+), 49 deletions(-)
diff --git a/routing.c b/routing.c index 7648b92..d562566 100644 --- a/routing.c +++ b/routing.c @@ -169,65 +169,40 @@ static int is_bidirectional_neigh(struct orig_node *orig_node, uint8_t orig_eq_count, neigh_rq_count, tq_own; int tq_asym_penalty, ret = 0;
- if (orig_node == orig_neigh_node) { - rcu_read_lock(); - hlist_for_each_entry_rcu(tmp_neigh_node, node, - &orig_node->neigh_list, list) { + /* find corresponding one hop neighbor */ + rcu_read_lock(); + hlist_for_each_entry_rcu(tmp_neigh_node, node, + &orig_neigh_node->neigh_list, list) {
- if (!compare_eth(tmp_neigh_node->addr, - orig_neigh_node->orig)) - continue; + if (!compare_eth(tmp_neigh_node->addr, orig_neigh_node->orig)) + continue;
- if (tmp_neigh_node->if_incoming != if_incoming) - continue; + if (tmp_neigh_node->if_incoming != if_incoming) + continue;
- if (!atomic_inc_not_zero(&tmp_neigh_node->refcount)) - continue; + if (!atomic_inc_not_zero(&tmp_neigh_node->refcount)) + continue;
- neigh_node = tmp_neigh_node; - } - rcu_read_unlock(); + neigh_node = tmp_neigh_node; + } + rcu_read_unlock();
- if (!neigh_node) - neigh_node = create_neighbor(orig_node, - orig_neigh_node, - orig_neigh_node->orig, - if_incoming); - if (!neigh_node) - goto out; + if (!neigh_node) + neigh_node = create_neighbor(orig_neigh_node, + orig_neigh_node, + orig_neigh_node->orig, + if_incoming);
+ if (!neigh_node) + goto out; + + /* if orig_node is direct neighbour update neigh_node last_valid */ + if (orig_node == orig_neigh_node) neigh_node->last_valid = jiffies; - } else { - /* find packet count of corresponding one hop neighbor */ - rcu_read_lock(); - hlist_for_each_entry_rcu(tmp_neigh_node, node, - &orig_neigh_node->neigh_list, list) { - - if (!compare_eth(tmp_neigh_node->addr, - orig_neigh_node->orig)) - continue; - - if (tmp_neigh_node->if_incoming != if_incoming) - continue; - - if (!atomic_inc_not_zero(&tmp_neigh_node->refcount)) - continue; - - neigh_node = tmp_neigh_node; - } - rcu_read_unlock(); - - if (!neigh_node) - neigh_node = create_neighbor(orig_neigh_node, - orig_neigh_node, - orig_neigh_node->orig, - if_incoming); - if (!neigh_node) - goto out; - }
orig_node->last_valid = jiffies;
+ /* find packet count of corresponding one hop neighbor */ spin_lock_bh(&orig_node->ogm_cnt_lock); orig_eq_count = orig_neigh_node->bcast_own_sum[if_incoming->if_num]; neigh_rq_count = neigh_node->real_packet_count;
On Saturday 07 May 2011 22:45:19 Sven Eckelmann wrote:
From: Daniele Furlan daniele.furlan@gmail.com
In function is_bidirectional_neigh the code that find out the one hop neighbor is duplicated.
Applied in revision fea56a5.
Thanks, Marek
b.a.t.m.a.n@lists.open-mesh.org
-
Daniele Furlan -
Marek Lindner -
Sven Eckelmann