Merge pull request #463 from ecsv/batadv-17.01

[feed/routing.git] / batman-adv / patches / 0054-batman-adv-Prevent-duplicated-global-TT-entry.patch

diff --git a/batman-adv/patches/0054-batman-adv-Prevent-duplicated-global-TT-entry.patch b/batman-adv/patches/0054-batman-adv-Prevent-duplicated-global-TT-entry.patch
index 8fce2bf26f5366f7051fc0e271eaba26c1582f66..33e5e4751b184d7a64efa1262f8f3559fd63936a 100644 (file)
--- a/batman-adv/patches/0054-batman-adv-Prevent-duplicated-global-TT-entry.patch
+++ b/batman-adv/patches/0054-batman-adv-Prevent-duplicated-global-TT-entry.patch
@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Thu, 6 Sep 2018 14:35:27 +0200
-Subject: [PATCH] batman-adv: Prevent duplicated global TT entry
+Subject: batman-adv: Prevent duplicated global TT entry
 
 The function batadv_tt_global_orig_entry_add is responsible for adding new
 tt_orig_list_entry to the orig_list. It first checks whether the entry
@@ -19,9 +19,6 @@ Signed-off-by: Sven Eckelmann <sven@narfation.org>
 Acked-by: Marek Lindner <mareklindner@neomailbox.ch>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/79097255a1a3e1bd1949be309af941181fbc7b36
----
- net/batman-adv/translation-table.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
 index 143a00f90d1d925aad7113f897d06f435f28dcd8..b32853cbab028f0a052492545bb803efdcdb0ff3 100644