From patchwork Sat Sep 15 21:51:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Linus_L=C3=BCssing?= X-Patchwork-Id: 2275 Return-Path: Received: from mout.web.de (mout.web.de [212.227.17.12]) by open-mesh.org (Postfix) with ESMTP id B369E600F07 for ; Sat, 15 Sep 2012 23:50:59 +0200 (CEST) Received: from localhost ([95.211.10.3]) by smtp.web.de (mrweb003) with ESMTPSA (Nemesis) id 0MRCoR-1T61Zk0n2l-00ToP4; Sat, 15 Sep 2012 23:50:59 +0200 From: =?UTF-8?q?Linus=20L=C3=BCssing?= To: b.a.t.m.a.n@lists.open-mesh.org Date: Sat, 15 Sep 2012 23:51:46 +0200 Message-Id: <1347745906-12749-1-git-send-email-linus.luessing@web.de> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-Provags-ID: V02:K0:/tDc83mIf8w02cwvvyfYgPTnmDTc73jGSIxyLdrmz9q rSCzS++z19CbvtZ/c5HSYYQdaO1jvjNKZZW4sScWF5dE2Rkdet /SRCJ3NDkrp6BAIVSbSc0aB/RY8KXp5GIehqMXOiu8ZSHpahsV ztYUcTaN8ADasGbk3drq7iYDQTQLf9qFwuzclow3VE8fjpB+KM 0rL2541MYmG8P06rusouw== Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: Fix symmetry check / route flapping in multi interface setups X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2012 21:50:59 -0000 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 --- This fixes the route flapping observed in ticket 163 (but unfortunately doesn't fix the main issue of this ticket, the starving routes, yet). bat_iv_ogm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 7f0adad..2c6b560 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -743,7 +743,8 @@ 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); - sum_orig = orig_node_tmp->bcast_own_sum[if_incoming->if_num]; + sum_orig = orig_node_tmp-> + bcast_own_sum[router->if_incoming->if_num]; spin_unlock_bh(&orig_node_tmp->ogm_cnt_lock); orig_node_tmp = neigh_node->orig_node;