From: Def <def@laposte.net>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH maint] batman-adv: Fix batadv_compare_tt function
Date: Mon, 27 Jul 2015 11:58:18 +0200 [thread overview]
Message-ID: <1437991098-22983-1-git-send-email-def@laposte.net> (raw)
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
next reply other threads:[~2015-07-27 9:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-27 9:58 Def [this message]
2015-08-03 19:53 ` [B.A.T.M.A.N.] [PATCH maint] batman-adv: Fix batadv_compare_tt function Antonio Quartulli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1437991098-22983-1-git-send-email-def@laposte.net \
--to=def@laposte.net \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox