[B.A.T.M.A.N.] [PATCH maint] batman-adv: Fix batadv_compare_tt function

[B.A.T.M.A.N.] [PATCH maint] batman-adv: Fix batadv_compare_tt function

[Def]

batadv_compare_tt have to check vid.

Signed-off-by: Def <def@laposte.net>
---
 translation-table.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/translation-table.c b/translation-table.c
index d73b103..d16433a 100644
--- a/translation-table.c
+++ b/translation-table.c
@@ -45,13 +45,16 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv,
 				 unsigned short vid, const char *message,
 				 bool roaming);
 
-/* returns 1 if they are the same mac addr */
+/* returns 1 if they are the same mac addr and vid */
 static int batadv_compare_tt(const struct hlist_node *node, const void *data2)
 {
 	const void *data1 = container_of(node, struct batadv_tt_common_entry,
 					 hash_entry);
 
-	return batadv_compare_eth(data1, data2);
+	struct batadv_tt_common_entry* tt1 = data1;
+	struct batadv_tt_common_entry* tt2 = data2;
+
+	return (tt1->vid == tt2->vid) && batadv_compare_eth(data1, data2);
 }
 
 /**
-- 
1.7.10.4

Re: [B.A.T.M.A.N.] [PATCH maint] batman-adv: Fix batadv_compare_tt function

[Antonio Quartulli]

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

Hi Def,


On 27/07/15 11:58, Def wrote:
> batadv_compare_tt have to check vid.
> 

since this is a fix and has to it go to the net tree of the kernel, can
you please elaborate a bit more about what you are fixing ? Not just on
the implementation level, but also from an higher point of view: i.e.
what is not working ? why is this fix required ? (you can also take
inspiration from what I wrote in the ticket about this problem).

Thanks!


-- 
Antonio Quartulli


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]