From 1d39b790011c2cb95c31a08f8c78ca1f2de11860 Mon Sep 17 00:00:00 2001 From: Antonio Quartulli Date: Thu, 8 Nov 2012 21:55:29 +0100 Subject: [PATCH] --- yaml --- r: 335761 b: refs/heads/master c: 1f36aebcc5fa53c5d98f3329186466b5eb76a168 h: refs/heads/master i: 335759: 02fae62c2d6a851f07e099b070100e3f514b5e88 v: v3 --- [refs] | 2 +- trunk/net/batman-adv/translation-table.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 60372e5d4c72..1e4d6939a218 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27b37ebfa2d2a1b6acef6f2d21c497475c9b9709 +refs/heads/master: 1f36aebcc5fa53c5d98f3329186466b5eb76a168 diff --git a/trunk/net/batman-adv/translation-table.c b/trunk/net/batman-adv/translation-table.c index fec1a00a0699..baae71585804 100644 --- a/trunk/net/batman-adv/translation-table.c +++ b/trunk/net/batman-adv/translation-table.c @@ -2456,6 +2456,13 @@ bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, { bool ret = false; + /* if the originator is a backbone node (meaning it belongs to the same + * LAN of this node) the temporary client must not be added because to + * reach such destination the node must use the LAN instead of the mesh + */ + if (batadv_bla_is_backbone_gw_orig(bat_priv, orig_node->orig)) + goto out; + if (!batadv_tt_global_add(bat_priv, orig_node, addr, BATADV_TT_CLIENT_TEMP, atomic_read(&orig_node->last_ttvn)))