Merge pull request #463 from ecsv/batadv-17.01

[feed/routing.git] / batman-adv / patches / 0033-batman-adv-fix-header-size-check-in-batadv_dbg_arp.patch

diff --git a/batman-adv/patches/0033-batman-adv-fix-header-size-check-in-batadv_dbg_arp.patch b/batman-adv/patches/0033-batman-adv-fix-header-size-check-in-batadv_dbg_arp.patch
index bb114bae22cae9f368a21ae894624f0ce9946373..25277f10fe669013473dea87e8311d073095d5f5 100644 (file)
--- a/batman-adv/patches/0033-batman-adv-fix-header-size-check-in-batadv_dbg_arp.patch
+++ b/batman-adv/patches/0033-batman-adv-fix-header-size-check-in-batadv_dbg_arp.patch
@@ -1,6 +1,6 @@
 From: Matthias Schiffer <mschiffer@universe-factory.net>
 Date: Fri, 16 Mar 2018 11:29:10 +0100
-Subject: [PATCH] batman-adv: fix header size check in batadv_dbg_arp()
+Subject: batman-adv: fix header size check in batadv_dbg_arp()
 
 Checking for 0 is insufficient: when an SKB without a batadv header, but
 with a VLAN header is received, hdr_size will be 4, making the following
@@ -11,9 +11,6 @@ Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/7dfe729b169b1217f47744edbd1616f473340fda
----
- net/batman-adv/distributed-arp-table.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
 index 4d982e63a3ab269e3d3b1e7a9d5f205638051603..fcd38e48a6ea74bd91b0bdd874cb5e88e661e729 100644