Merge pull request #463 from ecsv/batadv-17.01

[feed/routing.git] / batman-adv / patches / 0016-batman-adv-do-not-add-loop-detection-mac-addresses-t.patch

diff --git a/batman-adv/patches/0016-batman-adv-do-not-add-loop-detection-mac-addresses-t.patch b/batman-adv/patches/0016-batman-adv-do-not-add-loop-detection-mac-addresses-t.patch
index 225cf5887e5a636adc0572fae628ee1f3ef71173..d7ab158538c1f3c04840f1984f035d496c92ceb4 100644 (file)
--- a/batman-adv/patches/0016-batman-adv-do-not-add-loop-detection-mac-addresses-t.patch
+++ b/batman-adv/patches/0016-batman-adv-do-not-add-loop-detection-mac-addresses-t.patch
@@ -1,6 +1,6 @@
 From: Simon Wunderlich <sw@simonwunderlich.de>
 Date: Thu, 1 Jun 2017 17:11:24 +0200
-Subject: [PATCH] batman-adv: do not add loop detection mac addresses to global tt
+Subject: batman-adv: do not add loop detection mac addresses to global tt
 
 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
@@ -12,9 +12,6 @@ Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/1f1b6c0d96129e6445652061d93a7fb1f0476fa3
----
- 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 30ecbfb40adfa6f9f1c777fc93e42df8c39e4581..199da2abe6ab92161ab66faa01fa3d06aeb68c89 100644