Merge pull request #463 from ecsv/batadv-17.01

[feed/routing.git] / batman-adv / patches / 0006-batman-adv-don-t-add-loop-detect-macs-to-TT.patch

diff --git a/batman-adv/patches/0006-batman-adv-don-t-add-loop-detect-macs-to-TT.patch b/batman-adv/patches/0006-batman-adv-don-t-add-loop-detect-macs-to-TT.patch
index d2ced52dd3065dd387400202e7110dd1ecc594f9..d4c250d26bb0af0b8b3a1f774c99b9434eb3ae79 100644 (file)
--- a/batman-adv/patches/0006-batman-adv-don-t-add-loop-detect-macs-to-TT.patch
+++ b/batman-adv/patches/0006-batman-adv-don-t-add-loop-detect-macs-to-TT.patch
@@ -1,6 +1,6 @@
 From: Simon Wunderlich <simon.wunderlich@open-mesh.com>
 Date: Thu, 24 Nov 2016 16:11:01 +0100
-Subject: [PATCH] batman-adv: don't add loop detect macs to TT
+Subject: batman-adv: don't add loop detect macs to TT
 
 The bridge loop avoidance (BLA) feature of batman-adv sends packets to
 probe for Mesh/LAN packet loops. Those packets are not sent by real
@@ -10,10 +10,6 @@ Signed-off-by: Simon Wunderlich <simon.wunderlich@open-mesh.com>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/447df986b83630a92ca9d33903023b7e1b2917f3
----
- net/batman-adv/bridge_loop_avoidance.h | 18 ++++++++++++++++++
- net/batman-adv/soft-interface.c        |  3 ++-
- 2 files changed, 20 insertions(+), 1 deletion(-)
 
 diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h
 index 1ae93e46fb98498c00082728ca91216d78e13298..2827cd3c13d2a35a3b296340a0aa123dbd032926 100644