batman-adv: Refresh patches
[feed/routing.git] / batman-adv / patches / 0016-batman-adv-do-not-add-loop-detection-mac-addresses-t.patch
1 From: Simon Wunderlich <sw@simonwunderlich.de>
2 Date: Thu, 1 Jun 2017 17:11:24 +0200
3 Subject: batman-adv: do not add loop detection mac addresses to global tt
4
5 This change has been made for local TT already, add another one for
6 global TT - but only for temporary entries (aka speedy join), to prevent
7 inconsistencies between local and global tables in case an older
8 batman-adv version is still announcing those entries from its local
9 table.
10
11 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
12 Signed-off-by: Sven Eckelmann <sven@narfation.org>
13
14 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/1f1b6c0d96129e6445652061d93a7fb1f0476fa3
15
16 diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
17 index 30ecbfb40adfa6f9f1c777fc93e42df8c39e4581..199da2abe6ab92161ab66faa01fa3d06aeb68c89 100644
18 --- a/net/batman-adv/translation-table.c
19 +++ b/net/batman-adv/translation-table.c
20 @@ -4012,6 +4012,12 @@ bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv,
21 {
22 bool ret = false;
23
24 + /* ignore loop detect macs, they are not supposed to be in the tt local
25 + * data as well.
26 + */
27 + if (batadv_bla_is_loopdetect_mac(addr))
28 + return false;
29 +
30 if (!batadv_tt_global_add(bat_priv, orig_node, addr, vid,
31 BATADV_TT_CLIENT_TEMP,
32 atomic_read(&orig_node->last_ttvn)))