From: Simon Wunderlich <sw@simonwunderlich.de>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
Simon Wunderlich <sw@simonwunderlich.de>,
Sven Eckelmann <sven@narfation.org>
Subject: [PATCH 07/10] batman-adv: do not add loop detection mac addresses to global tt
Date: Tue, 13 Jun 2017 13:36:57 +0200 [thread overview]
Message-ID: <20170613113700.31220-8-sw@simonwunderlich.de> (raw)
In-Reply-To: <20170613113700.31220-1-sw@simonwunderlich.de>
This change has been made for local TT already, add another one for
global TT - but only for temporary entries (aka speedy join), to prevent
inconsistencies between local and global tables in case an older
batman-adv version is still announcing those entries from its local
table.
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
net/batman-adv/translation-table.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index e75b4937b497..4b64a9a633d9 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -4012,6 +4012,12 @@ bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv,
{
bool ret = false;
+ /* ignore loop detect macs, they are not supposed to be in the tt local
+ * data as well.
+ */
+ if (batadv_bla_is_loopdetect_mac(addr))
+ return false;
+
if (!batadv_tt_global_add(bat_priv, orig_node, addr, vid,
BATADV_TT_CLIENT_TEMP,
atomic_read(&orig_node->last_ttvn)))
--
2.11.0
next prev parent reply other threads:[~2017-06-13 11:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-13 11:36 [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13 Simon Wunderlich
[not found] ` <20170613113700.31220-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org>
2017-06-13 11:36 ` [PATCH 01/10] batman-adv: Start new development cycle Simon Wunderlich
2017-06-13 11:36 ` [PATCH 02/10] batman-adv: decrease maximum fragment size Simon Wunderlich
2017-06-13 11:36 ` [PATCH 03/10] batman-adv: Replace a seq_puts() call by seq_putc() in two functions Simon Wunderlich
2017-06-13 11:36 ` [PATCH 04/10] batman-adv: Combine two seq_puts() calls into one call in batadv_nc_nodes_seq_print_text() Simon Wunderlich
2017-06-13 11:36 ` [PATCH 05/10] batman-adv: Print correct function names in dbg messages Simon Wunderlich
2017-06-13 11:36 ` [PATCH 06/10] batman-adv: tp_meter: mark init function with __init Simon Wunderlich
2017-06-13 11:36 ` Simon Wunderlich [this message]
2017-06-13 11:36 ` [PATCH 08/10] batman-adv: simplify return handling in some TT functions Simon Wunderlich
2017-06-13 11:36 ` [PATCH 09/10] batman-adv: Use default throughput value on cfg80211 error Simon Wunderlich
2017-06-13 11:37 ` [PATCH 10/10] batman-adv: Accept only filled wifi station info Simon Wunderlich
2017-06-13 17:52 ` [PATCH 00/10] pull request for net-next: batman-adv 2017-06-13 David Miller
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=20170613113700.31220-8-sw@simonwunderlich.de \
--to=sw@simonwunderlich.de \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=sven@narfation.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;
as well as URLs for NNTP newsgroup(s).