Merge pull request #463 from ecsv/batadv-17.01

[feed/routing.git] / batman-adv / patches / 0032-batman-adv-update-data-pointers-after-skb_cow.patch

diff --git a/batman-adv/patches/0032-batman-adv-update-data-pointers-after-skb_cow.patch b/batman-adv/patches/0032-batman-adv-update-data-pointers-after-skb_cow.patch
index e8a522c03028b8ce325d747b4d0b9f9d80628f9e..affa839b7de0b6df541838b1b68e576fd7bab6f0 100644 (file)
--- a/batman-adv/patches/0032-batman-adv-update-data-pointers-after-skb_cow.patch
+++ b/batman-adv/patches/0032-batman-adv-update-data-pointers-after-skb_cow.patch
@@ -1,6 +1,6 @@
 From: Matthias Schiffer <mschiffer@universe-factory.net>
 Date: Fri, 16 Mar 2018 11:29:09 +0100
-Subject: [PATCH] batman-adv: update data pointers after skb_cow()
+Subject: batman-adv: update data pointers after skb_cow()
 
 batadv_check_unicast_ttvn() calls skb_cow(), so pointers into the SKB data
 must be (re)set after calling it. The ethhdr variable is dropped
@@ -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/64d22c76a207ed313b2496f0709b2567719452c4
----
- net/batman-adv/routing.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
 index 213cc01ad00392f7cbd4efd9d4796f76691d2d9e..8d927931017e53d285d9c64b4b850bb1d0388e11 100644