commits September 2012

commits@lists.open-mesh.org

1 participants
35 discussions

[linux-merge]linux integration; annotated tag, v3.6-rc7, created. v3.6-rc7
by postmaster＠open-mesh.org 24 Sep '12

24 Sep '12

The annotated tag, v3.6-rc7 has been created at cbdc1ccf2692ee9d0f50fe4911fa474b7ac2882c (tag) tagging 979570e02981d4a8fc20b3cc8fd651856c98ee9d (commit) replaces v3.6-rc6 tagged by Linus Torvalds on Sun Sep 23 18:11:06 2012 -0700 - Shortlog ------------------------------------------------------------ Linux 3.6-rc7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJQX7MuAAoJEHm+PkMAQRiG0h0IAJURkrMCAQUxA+Ik66ReH89s LQcVd0U9uL4UUOi7f5WR64Vf9Cfu6VVGX9ZKSvjpNskvlQaUQPMIt4pMe6g4X4dI u0bApEy4XZz3nGabUAghIU8jJ8cDmhCG6kPpSiS7pi7KHc0yIa4WFtJRrIpGaIWT xuK38YOiOHcSDRlLyWZzainMncQp/ixJdxnqVMTonkVLk0q0b84XzOr4/qlLE5lU i+TsK3PRKdQXgvZ4CebL+srPBwWX1dmgP3VkeBloQbSSenSeELICbFWavn2ml+sF GXi4dO93oNquL/Oy5SwI666T4uNcrRPaS+5X+xSZgBW/y2aQVJVJuNZg6ZP/uWk= =0v2l -----END PGP SIGNATURE----- Linus Lüssing (1): batman-adv: make batadv_test_bit() return 0 or 1 only ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 23 Sep '12

23 Sep '12

The annotated tag, batman-adv-fix-for-davem has been updated to 2b1b491ea921e9cd0ff85a15b1ab4fa62b11298e (tag) from 18a5dc5580fa6648a43351f833039754f4d8e48c (which is now obsolete) tagging 7caf69fb9c5017df01945a1861c042f6aa08edeb (commit) replaces v3.6-rc6 tagged by Antonio Quartulli on Sun Sep 23 23:16:22 2012 +0200 - Shortlog ------------------------------------------------------------ Included fixes: - fix the behaviour of batman-adv in case of virtual interface MAC change event - fix symmetric link check in neighbour selection -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlBffHkACgkQpGgxIkP9cweh4gCfRow8tAL8CnrzFV7cAyTXrZ3K sGkAoIOVe1hbuv4kfAh3eLz1kbd28y5n =1xhN -----END PGP SIGNATURE----- Def (1): batman-adv: Fix change mac address of soft iface. Linus Lüssing (2): batman-adv: make batadv_test_bit() return 0 or 1 only batman-adv: Fix symmetry check / route flapping in multi interface setups ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: Merge branch 'next' (a915748)
by postmaster＠open-mesh.org 23 Sep '12

23 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit a915748361c560142cf3986b49e02fdc16415135 Merge: bf02ad8 efc1b3a Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Sep 23 23:16:17 2012 +0800 Merge branch 'next' >--------------------------------------------------------------- a915748361c560142cf3986b49e02fdc16415135 bat_iv_ogm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (a915748)
by postmaster＠open-mesh.org 23 Sep '12

23 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 6c9d9ee batman-adv: Fix symmetry check / route flapping in multi interface setups efc1b3a Merge branch 'maint' into next a915748 Merge branch 'next'

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (efc1b3a)
by postmaster＠open-mesh.org 23 Sep '12

23 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 6c9d9ee batman-adv: Fix symmetry check / route flapping in multi interface setups efc1b3a Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (efc1b3a)
by postmaster＠open-mesh.org 23 Sep '12

23 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit efc1b3a90900749e03d17d8a14527b3758afd976 Merge: 3b1bf5a 6c9d9ee Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Sep 23 23:15:15 2012 +0800 Merge branch 'maint' into next Conflicts: bat_iv_ogm.c >--------------------------------------------------------------- efc1b3a90900749e03d17d8a14527b3758afd976 bat_iv_ogm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --cc bat_iv_ogm.c index df79300,469daab..b02b75d --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@@ -652,9 -642,9 +652,10 @@@ batadv_iv_ogm_orig_update(struct batadv struct batadv_neigh_node *router = NULL; struct batadv_orig_node *orig_node_tmp; struct hlist_node *node; + int if_num; uint8_t sum_orig, sum_neigh; uint8_t *neigh_addr; + uint8_t tq_avg; batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "update_originator(): Searching and updating originator entry of received packet\n");

1 0

[batman-adv] maint: batman-adv: Fix symmetry check / route flapping in multi interface setups (6c9d9ee)
by postmaster＠open-mesh.org 23 Sep '12

23 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 6c9d9eeac0fb5d6625256cd119d0a4994c63e965 Author: Linus Lüssing <linus.luessing(a)web.de> Date: Tue Sep 18 03:01:08 2012 +0200 batman-adv: Fix symmetry check / route flapping in multi interface setups If receiving an OGM from a neighbor other than the currently selected and if it has the same TQ then we are supposed to switch if this neighbor provides a more symmetric link than the currently selected one. However this symmetry check currently is broken if the interface of the neighbor we received the OGM from and the one of the currently selected neighbor differ: We are currently trying to determine the symmetry of the link towards the selected router via the link we received the OGM from instead of just checking via the link towards the currently selected router. This leads to way more route switches than necessary and can lead to permanent route flapping in many common multi interface setups. This patch fixes this issue by using the right interface for this symmetry check. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> >--------------------------------------------------------------- 6c9d9eeac0fb5d6625256cd119d0a4994c63e965 bat_iv_ogm.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index e877af8..469daab 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -642,7 +642,8 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, struct batadv_neigh_node *router = NULL; struct batadv_orig_node *orig_node_tmp; struct hlist_node *node; - uint8_t bcast_own_sum_orig, bcast_own_sum_neigh; + int if_num; + uint8_t sum_orig, sum_neigh; uint8_t *neigh_addr; batadv_dbg(BATADV_DBG_BATMAN, bat_priv, @@ -727,17 +728,17 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, if (router && (neigh_node->tq_avg == router->tq_avg)) { orig_node_tmp = router->orig_node; spin_lock_bh(&orig_node_tmp->ogm_cnt_lock); - bcast_own_sum_orig = - orig_node_tmp->bcast_own_sum[if_incoming->if_num]; + if_num = router->if_incoming->if_num; + sum_orig = orig_node_tmp->bcast_own_sum[if_num]; spin_unlock_bh(&orig_node_tmp->ogm_cnt_lock); orig_node_tmp = neigh_node->orig_node; spin_lock_bh(&orig_node_tmp->ogm_cnt_lock); - bcast_own_sum_neigh = - orig_node_tmp->bcast_own_sum[if_incoming->if_num]; + if_num = neigh_node->if_incoming->if_num; + sum_neigh = orig_node_tmp->bcast_own_sum[if_num]; spin_unlock_bh(&orig_node_tmp->ogm_cnt_lock); - if (bcast_own_sum_orig >= bcast_own_sum_neigh) + if (sum_orig >= sum_neigh) goto update_tt; }

1 0

[batman-adv] master's head updated: Merge branch 'next' (bf02ad8)
by postmaster＠open-mesh.org 23 Sep '12

23 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 86fa71a batman-adv: Fix change mac address of soft iface. 3b1bf5a Merge branch 'maint' into next bf02ad8 Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (bf02ad8)
by postmaster＠open-mesh.org 23 Sep '12

23 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit bf02ad89f85f8cb5a8b76bff05566a921ad7d19e Merge: bafd3f4 3b1bf5a Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Sep 23 17:28:43 2012 +0800 Merge branch 'next' >--------------------------------------------------------------- bf02ad89f85f8cb5a8b76bff05566a921ad7d19e soft-interface.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0

[batman-adv] next: Merge branch 'maint' into next (3b1bf5a)
by postmaster＠open-mesh.org 23 Sep '12

23 Sep '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 3b1bf5a6359c869a3337be721c17960b964280d7 Merge: 5c4608f 86fa71a Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Sep 23 17:27:22 2012 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 3b1bf5a6359c869a3337be721c17960b964280d7 soft-interface.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits September 2012