Merge pull request #463 from ecsv/batadv-17.01

[feed/routing.git] / batman-adv / patches / 0011-batman-adv-prevent-duplication-of-ARP-replies-when-D.patch

diff --git a/batman-adv/patches/0011-batman-adv-prevent-duplication-of-ARP-replies-when-D.patch b/batman-adv/patches/0011-batman-adv-prevent-duplication-of-ARP-replies-when-D.patch
index 8d83671d06ff1f49c309a51e239ada017ea6e006..7a2746bc65b9624b9bfe887da690f150b575e60a 100644 (file)
--- a/batman-adv/patches/0011-batman-adv-prevent-duplication-of-ARP-replies-when-D.patch
+++ b/batman-adv/patches/0011-batman-adv-prevent-duplication-of-ARP-replies-when-D.patch
@@ -1,6 +1,6 @@
 From: Andreas Pape <APape@phoenixcontact.com>
 Date: Mon, 5 Sep 2016 13:20:26 +0200
-Subject: [PATCH] batman-adv: prevent duplication of ARP replies when DAT is used
+Subject: batman-adv: prevent duplication of ARP replies when DAT is used
 
 If none of the backbone gateways in a bla setup has already knowledge of
 the mac address searched for in an incoming ARP request from the backbone
@@ -22,9 +22,6 @@ Signed-off-by: Sven Eckelmann <sven@narfation.org>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/81e422051cf0403e40615eb306d0ddaaddfee611
----
- net/batman-adv/distributed-arp-table.c | 32 ++++++++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
 
 diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
 index 4cfc9672507ba718d975a2f869bb89fc38e0d934..16216532c1d82c09337a9c5e7a4cd5b4ad3ded5d 100644