Merge pull request #463 from ecsv/batadv-17.01

lede-17.01: batman-adv: Merge bugfixes from 2019.1

batctl/patches/0001-batctl-change-PATH_BUFF_LEN-to-maximal-possible-valu.patch

@@ -1,6 +1,6 @@
 From: Philipp Psurek <philipp.psurek@gmail.com>
 Date: Tue, 13 Jun 2017 10:25:59 +0200
-Subject: [PATCH] batctl: change PATH_BUFF_LEN to maximal possible value
+Subject: batctl: change PATH_BUFF_LEN to maximal possible value
 
 The output of
 
@@ -14,10 +14,6 @@ Signed-off-by: Philipp Psurek <philipp.psurek@gmail.com>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batctl.git/commit/620226bf8cff30e6dd966c8fe922b2d4cddf843b
----
- functions.c | 2 +-
- functions.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/functions.c b/functions.c
 index abd588209337dcfa04be9aadbf4ba39bb46771bb..676012bb56f9f8aa757b4805e27d904181ee2d27 100644

batctl/patches/0002-batctl-suppress-implicit-fallthrough-compiler-warnin.patch

@@ -1,6 +1,6 @@
 From: Philipp Psurek <philipp.psurek@gmail.com>
 Date: Tue, 13 Jun 2017 13:08:24 +0200
-Subject: [PATCH] batctl: suppress implicit-fallthrough compiler warning
+Subject: batctl: suppress implicit-fallthrough compiler warning
 
 GCC 7.1.0 complains about an intended fallthrough.
 “__attribute__ ((fallthrough))” in this part of code would suppress this
@@ -22,9 +22,6 @@ Signed-off-by: Philipp Psurek <philipp.psurek@gmail.com>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batctl.git/commit/50ee3c45feeda6d8c04ee127097badf99f78a26e
----
- tp_meter.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/tp_meter.c b/tp_meter.c
 index f95b8391ff3426200697034f1087274ca9e5a9dd..ec0dc4802c638471ff3c38bd344e31c208b634a5 100644

batctl/patches/0003-batctl-Print-dummy-value-when-localtime-failed.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Date: Thu, 23 Nov 2017 15:04:35 +0100
-Subject: [PATCH] batctl: Print dummy value when localtime failed
+Subject: batctl: Print dummy value when localtime failed
 
 localtime can return NULL when the local time could not be calculated.
 Accessing this NULL pointer is not allowed.
@@ -10,9 +10,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batctl.git/commit/09dd2dc0b4945c83bd07ad4bce64062239d901fb
----
- tcpdump.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/tcpdump.c b/tcpdump.c
 index 2125b66d0871c4a127425bfad0135a9f565cfb78..db9c46afecf3de94dbd4d9292df1fe0812fb8bfc 100644

batctl/patches/0004-batctl-Handle-failure-during-hash_iterator-allocatio.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Date: Thu, 23 Nov 2017 15:04:36 +0100
-Subject: [PATCH] batctl: Handle failure during hash_iterator allocation
+Subject: batctl: Handle failure during hash_iterator allocation
 
 The iterator functions should not try to start the iteration when the
 iterator could not be allocated.
@@ -9,9 +9,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batctl.git/commit/aa316bf6d1b2cf0ab7189ed8620c17f5018d4d37
----
- hash.c | 3 +++
- 1 file changed, 3 insertions(+)
 
 diff --git a/hash.c b/hash.c
 index 08d47b5b8f812d718f9463c548d73fbffb49b1b3..c6f735c64b573928441b41936646d195bc0da4bb 100644

batctl/patches/0005-batctl-Handle-allocation-error-for-path_buff.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Date: Thu, 23 Nov 2017 15:04:37 +0100
-Subject: [PATCH] batctl: Handle allocation error for path_buff
+Subject: batctl: Handle allocation error for path_buff
 
 Fixes: 5a1af99276b0 ("batctl: adapt batctl to new sysfs interface handling")
 Fixes: 306fcb4480c9 ("batctl: support for multiple mesh clouds")
@@ -10,9 +10,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batctl.git/commit/3b52283a5f60d1c6ec11628d031e72f0a28a720f
----
- sys.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
 
 diff --git a/sys.c b/sys.c
 index b52434072b34b949c73de8346f8c2dce615423a4..3047b5f6eebf26290f2d8c4840d52bb1bddc3e3f 100644

batctl/patches/0006-batctl-Handle-nlmsg_alloc-errors.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Date: Thu, 23 Nov 2017 15:04:38 +0100
-Subject: [PATCH] batctl: Handle nlmsg_alloc errors
+Subject: batctl: Handle nlmsg_alloc errors
 
 nlmsg_alloc may return NULL on errors. The processing has to be aborted
 when this happens.
@@ -10,9 +10,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batctl.git/commit/27e9937635ffbfe33f7f3297aff911718b8deb56
----
- netlink.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
 
 diff --git a/netlink.c b/netlink.c
 index 5f4325b0bb6b4a41860a75bd0851e446c5af9a88..64afeedac46bf3eab14a1d89d7db4491fbef8d81 100644

batctl/patches/0007-batctl-Handle-nl_socket_alloc-errors.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Date: Thu, 23 Nov 2017 15:04:39 +0100
-Subject: [PATCH] batctl: Handle nl_socket_alloc errors
+Subject: batctl: Handle nl_socket_alloc errors
 
 nl_socket_alloc may return NULL on errors. The processing has to be aborted
 when this happens.
@@ -10,9 +10,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batctl.git/commit/bc6cd37e0d3ce08e3b89e3123ffa87dc55f24c09
----
- netlink.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
 
 diff --git a/netlink.c b/netlink.c
 index 64afeedac46bf3eab14a1d89d7db4491fbef8d81..107ca52a4866e25b7b04428d770a885ca4e826d2 100644

batctl/patches/0008-batctl-Handle-nl_cb_alloc-errors.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Date: Thu, 23 Nov 2017 15:04:40 +0100
-Subject: [PATCH] batctl: Handle nl_cb_alloc errors
+Subject: batctl: Handle nl_cb_alloc errors
 
 nl_cb_alloc may return NULL on errors. The processing has to be aborted
 when this happens.
@@ -10,9 +10,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batctl.git/commit/0a14f8800dac67d706827e9be7745e2319f5412c
----
- netlink.c | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/netlink.c b/netlink.c
 index 107ca52a4866e25b7b04428d770a885ca4e826d2..3eb66c9de30c21722bb1e348b055838ea14d18cf 100644

batctl/patches/0009-batctl-Free-nl_sock-on-genl_ctrl_resolve-error.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Date: Thu, 23 Nov 2017 15:04:41 +0100
-Subject: [PATCH] batctl: Free nl_sock on genl_ctrl_resolve error
+Subject: batctl: Free nl_sock on genl_ctrl_resolve error
 
 genl_ctrl_resolve may return NULL on errors. The code must then free the
 socket which was used to start the genl_ctrl_resolve and stop the function
@@ -11,9 +11,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batctl.git/commit/cdac2f843c616caaa2a0d3847aeec84c200c62d6
----
- netlink.c | 16 +++++++++++-----
- 1 file changed, 11 insertions(+), 5 deletions(-)
 
 diff --git a/netlink.c b/netlink.c
 index 3eb66c9de30c21722bb1e348b055838ea14d18cf..ee58ce8bf16e224374940dddaff61f7b3c5aa4bb 100644

batctl/patches/0010-batctl-Free-nl_sock-when-if_nametoindex-failed.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Date: Thu, 23 Nov 2017 15:04:42 +0100
-Subject: [PATCH] batctl: Free nl_sock when if_nametoindex failed
+Subject: batctl: Free nl_sock when if_nametoindex failed
 
 The if_nametoindex can return an error. The code must then free the
 previously allocated nl_sock and stop the function with an error code.
@@ -10,9 +10,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batctl.git/commit/4361841bf76ecd27dcfca6edc30c63b05854d415
----
- netlink.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/netlink.c b/netlink.c
 index ee58ce8bf16e224374940dddaff61f7b3c5aa4bb..88a5c95c67989a812231aec7352eecfc4e38c70d 100644

batctl/patches/0011-batctl-tcpdump-Fix-types-for-for-TT-v1.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Date: Thu, 23 Nov 2017 15:04:43 +0100
-Subject: [PATCH] batctl: tcpdump: Fix types for for TT v1
+Subject: batctl: tcpdump: Fix types for for TT v1
 
 The num_entry and num_vlan variables are accessed (printed) as u16
 variables and not like integers. They should therefore also be stored like
@@ -10,9 +10,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batctl.git/commit/15a1335cadacc7c3bb4723a30617d123a961a311
----
- tcpdump.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/tcpdump.c b/tcpdump.c
 index db9c46afecf3de94dbd4d9292df1fe0812fb8bfc..da5541ea9f5f9f9b6fd0838d2242daa22d41a28d 100644

batctl/patches/0012-batctl-Simplify-concatenation-of-pathnames.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Date: Thu, 23 Nov 2017 15:04:44 +0100
-Subject: [PATCH] batctl: Simplify concatenation of pathnames
+Subject: batctl: Simplify concatenation of pathnames
 
 The combination of strncpy and strncat is hard to read and it is rather
 easy to introduce some kind of problems when using that. The usage of
@@ -10,10 +10,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batctl.git/commit/cfaec23c5f6f2cf649f3e0673b2e0c61bc01969f
----
- bat-hosts.c | 4 +---
- functions.c | 8 ++------
- 2 files changed, 3 insertions(+), 9 deletions(-)
 
 diff --git a/bat-hosts.c b/bat-hosts.c
 index a4add34bbaf8c34f8357ba8d1583218fdaf4df93..66e8f05bd2277e5560be77a26b97245223fa72aa 100644

batctl/patches/0013-batctl-Handle-allocation-error-in-vlan_get_link_pars.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Sat, 2 Dec 2017 08:45:59 +0100
-Subject: [PATCH] batctl: Handle allocation error in vlan_get_link_parse
+Subject: batctl: Handle allocation error in vlan_get_link_parse
 
 The malloc could fail and return NULL. In this case, the processing of the
 current interface index has to be stopped to avoid writing to NULL (which
@@ -11,9 +11,6 @@ Signed-off-by: Sven Eckelmann <sven@narfation.org>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batctl.git/commit/2ea390ce9bdda39d3c15bd9470009f56f42d5ed9
----
- functions.c | 3 +++
- 1 file changed, 3 insertions(+)
 
 diff --git a/functions.c b/functions.c
 index 1c96e6241d01b83a136ff135bee8dd780629f7aa..f91f26f4045766474d5dc109d76e20afd91a7791 100644

batman-adv/Makefile

@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=batman-adv
 
 PKG_VERSION:=2016.5
-PKG_RELEASE:=12
+PKG_RELEASE:=13
 PKG_MD5SUM:=6717a933a08dd2a01b00df30cb9f16a8
 PKG_HASH:=d0a0fc90c4f410b57d043215e253bb0b855efa5edbe165d87c17bfdcfafd0db7
 

batman-adv/patches/0001-Add-compat-fallback-for-batadv_getlink_net.patch

@@ -1,11 +1,8 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Fri, 23 Sep 2016 14:55:38 +0200
-Subject: [PATCH] Add compat fallback for batadv_getlink_net
+Subject: Add compat fallback for batadv_getlink_net
 
 Forwarded: not-needed
----
- net/batman-adv/hard-interface.c | 4 ++++
- 1 file changed, 4 insertions(+)
 
 diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
 index 61a431a9772ba96418644b399c9e787cbfd0e743..6969f580d0bfd0428f1c6985eaec8bbbf5a0d38b 100644

batman-adv/patches/0002-batman-adv-Decrease-hardif-refcnt-on-fragmentation-s.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Tue, 27 Dec 2016 08:51:17 +0100
-Subject: [PATCH] batman-adv: Decrease hardif refcnt on fragmentation send error
+Subject: batman-adv: Decrease hardif refcnt on fragmentation send error
 
 An error before the hardif is found has to free the skb. But every error
 after that has to free the skb + put the hard interface.
@@ -10,9 +10,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/205dc8385dc863467f4f6ccec2e63254e6baf831
----
- net/batman-adv/fragmentation.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
 index 9c561e683f4b8b68642b626b51a0dcda30260e97..0854ebd8613e9bf9044b04099b11341325d6e194 100644

batman-adv/patches/0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Sun, 12 Feb 2017 11:26:33 +0100
-Subject: [PATCH] batman-adv: Fix double free during fragment merge error
+Subject: batman-adv: Fix double free during fragment merge error
 
 The function batadv_frag_skb_buffer was supposed not to consume the skbuff
 on errors. This was followed in the helper function
@@ -19,9 +19,6 @@ Fixes: 9b3eab61754d ("batman-adv: Receive fragmented packets and merge")
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/e3bab02816097f860545d9ce9ae0808c69d7c92f
----
- net/batman-adv/fragmentation.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
 index 0854ebd8613e9bf9044b04099b11341325d6e194..31e97e9aee0d543b68be091936888e1f6c9dd7eb 100644

batman-adv/patches/0004-batman-adv-Fix-transmission-of-final-16th-fragment.patch

@@ -1,6 +1,6 @@
 From: Linus Lüssing <linus.luessing@c0d3.blue>
 Date: Mon, 13 Feb 2017 20:44:31 +0100
-Subject: [PATCH] batman-adv: Fix transmission of final, 16th fragment
+Subject: batman-adv: Fix transmission of final, 16th fragment
 
 Trying to split and transmit a unicast packet in 16 parts will fail for
 the final fragment: After having sent the 15th one with a frag_packet.no
@@ -18,9 +18,6 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/464eff3b1768ff190466a453a57ac140ea5cb756
----
- net/batman-adv/fragmentation.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
 index 31e97e9aee0d543b68be091936888e1f6c9dd7eb..11149e5be4e0ef9dfe2872e1d8d1f6dbb4ccdb14 100644

batman-adv/patches/0005-batman-adv-Treat-NET_XMIT_CN-as-transmit-successfull.patch

@@ -1,6 +1,6 @@
 From: Gao Feng <gfree.wind@gmail.com>
 Date: Mon, 21 Nov 2016 23:00:32 +0800
-Subject: [PATCH] batman-adv: Treat NET_XMIT_CN as transmit successfully
+Subject: batman-adv: Treat NET_XMIT_CN as transmit successfully
 
 The tc could return NET_XMIT_CN as one congestion notification, but
 it does not mean the packet is lost. Other modules like ipvlan,
@@ -12,13 +12,6 @@ Signed-off-by: Gao Feng <gfree.wind@gmail.com>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/1120b81c74187f489c08fc9438305071def089cc
----
- net/batman-adv/distributed-arp-table.c |  3 ++-
- net/batman-adv/fragmentation.c         |  2 +-
- net/batman-adv/routing.c               | 10 +++++-----
- net/batman-adv/soft-interface.c        |  2 +-
- net/batman-adv/tp_meter.c              |  2 +-
- 5 files changed, 10 insertions(+), 9 deletions(-)
 
 diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
 index 49576c5a3fe306a42c28c3901d2b2c6cce7d0b8e..3641765d55df049a5dbac35d322ebc537a0f0322 100644

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

batman-adv/patches/0007-batman-adv-decrease-maximum-fragment-size.patch

@@ -1,6 +1,6 @@
 From: Matthias Schiffer <mschiffer@universe-factory.net>
 Date: Wed, 22 Feb 2017 17:25:41 +0100
-Subject: [PATCH] batman-adv: decrease maximum fragment size
+Subject: batman-adv: decrease maximum fragment size
 
 With this patch the maximum fragment size is reduced from 1400 to 1280
 bytes.
@@ -33,9 +33,6 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/eb60b63140af5ec01ea0916837c2816cad10d6c1
----
- net/batman-adv/main.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
 index a6cc8040a21dd24fb507683230fd66a9edb62458..5b7855560e8ad121c7b48da97807b6895be158fc 100644

batman-adv/patches/0008-batman-adv-Keep-fragments-equally-sized.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Wed, 22 Feb 2017 17:25:42 +0100
-Subject: [PATCH] batman-adv: Keep fragments equally sized
+Subject: batman-adv: Keep fragments equally sized
 
 The batman-adv fragmentation packets have the design problem that they
 cannot be refragmented. This often leads to problems when networks are
@@ -20,9 +20,6 @@ Signed-off-by: Sven Eckelmann <sven@narfation.org>
 Acked-by: Linus Lüssing <linus.luessing@c0d3.blue>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/3caa5d14206ce8d4bd48bc931f213dec47ea1566
----
- net/batman-adv/fragmentation.c | 20 +++++++++++++-------
- 1 file changed, 13 insertions(+), 7 deletions(-)
 
 diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
 index d33f16b9b8ac13ba630bf9ac8c5f4f0ca79fc878..70e512111528b0345889cea4ffd0ad5d984a4e6a 100644

batman-adv/patches/0009-batman-adv-Initialize-gw-sel_class-via-batadv_algo.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Sat, 4 Mar 2017 16:33:31 +0100
-Subject: [PATCH] batman-adv: Initialize gw sel_class via batadv_algo
+Subject: batman-adv: Initialize gw sel_class via batadv_algo
 
 The gateway selection class variable is shared between different algorithm
 versions. But the interpretation of the content is algorithm specific. The
@@ -18,13 +18,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/ef565a1434966750644affda86fd11b0b69edbfe
----
- net/batman-adv/bat_iv_ogm.c     | 11 +++++++++++
- net/batman-adv/bat_v.c          | 14 +++++++++++---
- net/batman-adv/gateway_common.c |  5 +++++
- net/batman-adv/soft-interface.c |  1 -
- net/batman-adv/types.h          |  2 ++
- 5 files changed, 29 insertions(+), 4 deletions(-)
 
 diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
 index f00f666e2ccd4714bb7a5210c48e39edb40e0c17..7bfd0d7ef49df8e699f91e2b827b824aa3657c0d 100644

batman-adv/patches/0010-batman-adv-prevent-multiple-ARP-replies-sent-by-gate.patch

@@ -1,6 +1,6 @@
 From: Andreas Pape <APape@phoenixcontact.com>
 Date: Mon, 5 Sep 2016 13:20:25 +0200
-Subject: [PATCH] batman-adv: prevent multiple ARP replies sent by gateways if dat enabled
+Subject: batman-adv: prevent multiple ARP replies sent by gateways if dat enabled
 
 If dat is enabled it must be made sure that only the backbone gw which has
 claimed the remote destination for the ARP request answers the ARP request
@@ -15,11 +15,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/0c794961bc0d32386cffdc6d41c5ee21d9638e5b
----
- net/batman-adv/bridge_loop_avoidance.c | 49 ++++++++++++++++++++++++++++++++++
- net/batman-adv/bridge_loop_avoidance.h | 11 ++++++++
- net/batman-adv/distributed-arp-table.c | 15 +++++++++++
- 3 files changed, 75 insertions(+)
 
 diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
 index e7f690b571ea9be8ace25843d6e187a907486b99..41ab4a67a07b264bccdc5bccf73920909ff35c40 100644

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

batman-adv/patches/0012-batman-adv-drop-unicast-packets-from-other-backbone-.patch

@@ -1,6 +1,6 @@
 From: Andreas Pape <APape@phoenixcontact.com>
 Date: Mon, 5 Sep 2016 13:20:27 +0200
-Subject: [PATCH] batman-adv: drop unicast packets from other backbone gw
+Subject: batman-adv: drop unicast packets from other backbone gw
 
 Additional dropping of unicast packets received from another backbone gw if
 the same backbone network before being forwarded to the same backbone again
@@ -14,9 +14,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/bfe2a1971f43ef540ef0440d319542fa7d41d81f
----
- net/batman-adv/routing.c | 25 ++++++++++++++++++++++---
- 1 file changed, 22 insertions(+), 3 deletions(-)
 
 diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
 index 6b08b26da4d94be9c8c5e9dc708ddc18d8282428..5190683424b89d1fa7c86895000bc6656e6a65dd 100644

batman-adv/patches/0013-batman-adv-fix-memory-leak-when-dropping-packet-from.patch

@@ -1,6 +1,6 @@
 From: Andreas Pape <apape@phoenixcontact.com>
 Date: Fri, 19 May 2017 10:01:42 +0200
-Subject: [PATCH] batman-adv: fix memory leak when dropping packet from other gateway
+Subject: batman-adv: fix memory leak when dropping packet from other gateway
 
 The skb must be released in the receive handler since b91a2543b4c1
 ("batman-adv: Consume skb in receive handlers"). Just returning NET_RX_DROP
@@ -14,9 +14,6 @@ Signed-off-by: Andreas Pape <apape@phoenixcontact.com>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/a58feb79ed1447e3e83f3b0b1a23779886869f39
----
- net/batman-adv/routing.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
 index 5190683424b89d1fa7c86895000bc6656e6a65dd..213cc01ad00392f7cbd4efd9d4796f76691d2d9e 100644

batman-adv/patches/0014-batman-adv-handle-race-condition-for-claims-between-.patch

@@ -1,6 +1,6 @@
 From: Andreas Pape <APape@phoenixcontact.com>
 Date: Mon, 5 Sep 2016 13:20:29 +0200
-Subject: [PATCH] batman-adv: handle race condition for claims between gateways
+Subject: batman-adv: handle race condition for claims between gateways
 
 Consider the following situation which has been found in a test setup:
 Gateway B has claimed client C and gateway A has the same backbone
@@ -30,9 +30,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/cbb2ccc101e220b339989d5a51c0ca226ceda792
----
- net/batman-adv/bridge_loop_avoidance.c | 20 ++++++++++++++++----
- 1 file changed, 16 insertions(+), 4 deletions(-)
 
 diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
 index 41ab4a67a07b264bccdc5bccf73920909ff35c40..1e6e5d4468ad50c221ea5a0d436678d16c5e154f 100644

batman-adv/patches/0015-batman-adv-Fix-rx-packet-bytes-stats-on-local-ARP-re.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Wed, 5 Apr 2017 16:26:17 +0200
-Subject: [PATCH] batman-adv: Fix rx packet/bytes stats on local ARP reply
+Subject: batman-adv: Fix rx packet/bytes stats on local ARP reply
 
 The stats are generated by batadv_interface_stats and must not be stored
 directly in the net_device stats member variable. The batadv_priv
@@ -14,9 +14,6 @@ Fixes: 75ca71d858f5 ("batman-adv: Distributed ARP Table - add snooping functions
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/426ddde4ffe0c7345d1a7409bf899f89ddea26d3
----
- net/batman-adv/distributed-arp-table.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
 index 16216532c1d82c09337a9c5e7a4cd5b4ad3ded5d..4d982e63a3ab269e3d3b1e7a9d5f205638051603 100644

batman-adv/patches/0016-batman-adv-do-not-add-loop-detection-mac-addresses-t.patch

@@ -1,6 +1,6 @@
 From: Simon Wunderlich <sw@simonwunderlich.de>
 Date: Thu, 1 Jun 2017 17:11:24 +0200
-Subject: [PATCH] batman-adv: do not add loop detection mac addresses to global tt
+Subject: batman-adv: do not add loop detection mac addresses to global tt
 
 This change has been made for local TT already, add another one for
 global TT - but only for temporary entries (aka speedy join), to prevent
@@ -12,9 +12,6 @@ Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/1f1b6c0d96129e6445652061d93a7fb1f0476fa3
----
- net/batman-adv/translation-table.c | 6 ++++++
- 1 file changed, 6 insertions(+)
 
 diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
 index 30ecbfb40adfa6f9f1c777fc93e42df8c39e4581..199da2abe6ab92161ab66faa01fa3d06aeb68c89 100644

batman-adv/patches/0017-batman-adv-Use-default-throughput-value-on-cfg80211-.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Fri, 9 Jun 2017 17:06:50 +0200
-Subject: [PATCH] batman-adv: Use default throughput value on cfg80211 error
+Subject: batman-adv: Use default throughput value on cfg80211 error
 
 A wifi interface should never be handled like an ethernet devices. The
 parser of the cfg80211 output must therefore skip the ethtool code when
@@ -12,9 +12,6 @@ Reviewed-by: Marek Lindner <mareklindner@neomailbox.ch>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/76ef29071b0050f972a626747d034a494a7195d7
----
- net/batman-adv/bat_v_elp.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
 index f2fb2f05b6bf280d2b5fae26ed10288f73345f16..7c54a9291c9eaed75dfdfdfbd200f84c51576cb3 100644

batman-adv/patches/0018-batman-adv-Accept-only-filled-wifi-station-info.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Fri, 9 Jun 2017 17:06:51 +0200
-Subject: [PATCH] batman-adv: Accept only filled wifi station info
+Subject: batman-adv: Accept only filled wifi station info
 
 The wifi driver can decide to not provide parts of the station info. For
 example, the expected throughput of the station can be omitted when the
@@ -17,13 +17,6 @@ Reviewed-by: Marek Lindner <mareklindner@neomailbox.ch>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/1e26904b364ceffe9ca7d6da7412e70fb2a04178
----
- compat-include/linux/nl80211.h      | 14 ++++++++++++++
- compat-include/uapi/linux/nl80211.h | 16 ++++++++++++++++
- net/batman-adv/bat_v_elp.c          |  4 ++++
- 3 files changed, 34 insertions(+)
- create mode 100644 compat-include/linux/nl80211.h
- create mode 100644 compat-include/uapi/linux/nl80211.h
 
 diff --git a/compat-include/linux/nl80211.h b/compat-include/linux/nl80211.h
 new file mode 100644

batman-adv/patches/0019-batman-adv-fix-TT-sync-flag-inconsistencies.patch

@@ -1,6 +1,6 @@
 From: Linus Lüssing <linus.luessing@c0d3.blue>
 Date: Thu, 6 Jul 2017 07:02:25 +0200
-Subject: [PATCH] batman-adv: fix TT sync flag inconsistencies
+Subject: batman-adv: fix TT sync flag inconsistencies
 
 This patch fixes an issue in the translation table code potentially
 leading to a TT Request + Response storm. The issue may occur for nodes
@@ -34,10 +34,6 @@ Acked-by: Antonio Quartulli <a@unstable.cc>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/382d020fe3fa528b1f65f8107df8fc023eb8cacb
----
- net/batman-adv/translation-table.c | 60 ++++++++++++++++++++++++++++++++------
- net/batman-adv/types.h             |  2 ++
- 2 files changed, 53 insertions(+), 9 deletions(-)
 
 diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
 index 199da2abe6ab92161ab66faa01fa3d06aeb68c89..a64003b824e0d0b05f0a9e44ccc32ba0cb3018fc 100644

batman-adv/patches/0020-batman-adv-Avoid-spurious-warnings-from-bat_v-neigh_.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Date: Mon, 16 Oct 2017 09:48:03 +0200
-Subject: [PATCH] batman-adv: Avoid spurious warnings from bat_v neigh_cmp implementation
+Subject: batman-adv: Avoid spurious warnings from bat_v neigh_cmp implementation
 
 The neighbor compare API implementation for B.A.T.M.A.N. V checks whether
 the neigh_ifinfo for this neighbor on a specific interface exists. A
@@ -18,9 +18,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Acked-by: Antonio Quartulli <a@unstable.cc>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/0dee8aba4702f82197ed3428ede6b3884fdff5ca
----
- net/batman-adv/bat_v.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
 index 2e2471ca84e392faac7fd6537bf137161e27542a..80679f17d40170237ce6ad2d800da96bbef79e37 100644

batman-adv/patches/0021-batman-adv-Always-initialize-fragment-header-priorit.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
 Date: Wed, 29 Nov 2017 10:25:02 +0100
-Subject: [PATCH] batman-adv: Always initialize fragment header priority
+Subject: batman-adv: Always initialize fragment header priority
 
 The batman-adv unuicast fragment header contains 3 bits for the priority of
 the packet. These bits will be initialized when the skb->priority contains
@@ -11,9 +11,6 @@ Fixes: 4f241fcea704 ("batman-adv: Include frame priority in fragment header")
 Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/e45a75c82feae23a20d2744ccfde03780ccdafc7
----
- net/batman-adv/fragmentation.c | 2 ++
- 1 file changed, 2 insertions(+)
 
 diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
 index 70e512111528b0345889cea4ffd0ad5d984a4e6a..28f54887c975905d03372ab8ba5274fd82117651 100644

batman-adv/patches/0022-batman-adv-Fix-check-of-retrieved-orig_gw-in-batadv_.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Date: Wed, 29 Nov 2017 10:50:42 +0100
-Subject: [PATCH] batman-adv: Fix check of retrieved orig_gw in batadv_v_gw_is_eligible
+Subject: batman-adv: Fix check of retrieved orig_gw in batadv_v_gw_is_eligible
 
 The batadv_v_gw_is_eligible function already assumes that orig_node is not
 NULL. But batadv_gw_node_get may have failed to find the originator. It
@@ -12,9 +12,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Acked-by: Antonio Quartulli <a@unstable.cc>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/c7380677d6167f3798d3ea7a4f1a93663f3c7915
----
- net/batman-adv/bat_v.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
 index 80679f17d40170237ce6ad2d800da96bbef79e37..2f77e112d4cb4db7b1086715a597ef995054fdc1 100644

batman-adv/patches/0023-batman-adv-Fix-lock-for-ogm-cnt-access-in-batadv_iv_.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Sun, 3 Dec 2017 11:26:45 +0100
-Subject: [PATCH] batman-adv: Fix lock for ogm cnt access in batadv_iv_ogm_calc_tq
+Subject: batman-adv: Fix lock for ogm cnt access in batadv_iv_ogm_calc_tq
 
 The originator node object orig_neigh_node is used to when accessing the
 bcast_own(_sum) and real_packet_count information. The access to them has
@@ -14,9 +14,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/9a3b195410e5d2f285cdf0073fef721ff8d9474d
----
- net/batman-adv/bat_iv_ogm.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
 index 7bfd0d7ef49df8e699f91e2b827b824aa3657c0d..56b4984d738e87098c24213d4aa277a2ef948fec 100644

batman-adv/patches/0024-batman-adv-fix-packet-checksum-in-receive-path.patch

@@ -1,6 +1,6 @@
 From: Matthias Schiffer <mschiffer@universe-factory.net>
 Date: Tue, 23 Jan 2018 10:59:49 +0100
-Subject: [PATCH] batman-adv: fix packet checksum in receive path
+Subject: batman-adv: fix packet checksum in receive path
 
 eth_type_trans() internally calls skb_pull(), which does not adjust the
 skb checksum; skb_postpull_rcsum() is necessary to avoid log spam of the
@@ -18,9 +18,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/798174b15153afd88268f2f87811602f68b3f2c6
----
- net/batman-adv/soft-interface.c | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
 
 diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
 index 08432b14386a53c771c54b9eb38893d94c6f9b53..5da1a1c0f1efb5d95f31bc852b899f61e462feb1 100644

batman-adv/patches/0025-batman-adv-invalidate-checksum-on-fragment-reassembl.patch

@@ -1,6 +1,6 @@
 From: Matthias Schiffer <mschiffer@universe-factory.net>
 Date: Tue, 23 Jan 2018 10:59:50 +0100
-Subject: [PATCH] batman-adv: invalidate checksum on fragment reassembly
+Subject: batman-adv: invalidate checksum on fragment reassembly
 
 A more sophisticated implementation could try to combine fragment checksums
 when all fragments have CHECKSUM_COMPLETE and are split at even offsets.
@@ -19,9 +19,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/2c1bce065baa688bc1eca4116f83ca3b790432a5
----
- net/batman-adv/fragmentation.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
 index 28f54887c975905d03372ab8ba5274fd82117651..5969d3705ec08a96438ecce06577d35291600753 100644

batman-adv/patches/0026-batman-adv-Ignore-invalid-batadv_iv_gw-during-netlin.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Date: Mon, 19 Feb 2018 14:08:52 +0100
-Subject: [PATCH] batman-adv: Ignore invalid batadv_iv_gw during netlink send
+Subject: batman-adv: Ignore invalid batadv_iv_gw during netlink send
 
 The function batadv_iv_gw_dump stops the processing loop when
 batadv_iv_gw_dump_entry returns a non-0 return code. This should only
@@ -14,9 +14,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/c58f37c248bb4926cda82fd0463b6fecb3d3654f
----
- net/batman-adv/bat_iv_ogm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
 index 56b4984d738e87098c24213d4aa277a2ef948fec..1847898906d495980a71eb6a0e5a7b510e55d003 100644

batman-adv/patches/0027-batman-adv-Ignore-invalid-batadv_v_gw-during-netlink.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Date: Mon, 19 Feb 2018 14:08:53 +0100
-Subject: [PATCH] batman-adv: Ignore invalid batadv_v_gw during netlink send
+Subject: batman-adv: Ignore invalid batadv_v_gw during netlink send
 
 The function batadv_v_gw_dump stops the processing loop when
 batadv_v_gw_dump_entry returns a non-0 return code. This should only
@@ -14,9 +14,6 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/12f1d3a6bf4d157928fec509aab981e5243ee438
----
- net/batman-adv/bat_v.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
 index 2f77e112d4cb4db7b1086715a597ef995054fdc1..0488063ff6ac5985e27c3a0df41ab3566b48abb8 100644

batman-adv/patches/0028-batman-adv-Fix-netlink-dumping-of-BLA-claims.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Sat, 24 Feb 2018 12:03:36 +0100
-Subject: [PATCH] batman-adv: Fix netlink dumping of BLA claims
+Subject: batman-adv: Fix netlink dumping of BLA claims
 
 The function batadv_bla_claim_dump_bucket must be able to handle
 non-complete dumps of a single bucket. It tries to do that by saving the
@@ -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/49197c00f82cfcfeef963ef9367841d38a6ff207
----
- net/batman-adv/bridge_loop_avoidance.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
 index 1e6e5d4468ad50c221ea5a0d436678d16c5e154f..4784469cadd4364b6239ce9ff0d1c7cc254de439 100644

batman-adv/patches/0029-batman-adv-Fix-netlink-dumping-of-BLA-backbones.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Sat, 24 Feb 2018 12:03:37 +0100
-Subject: [PATCH] batman-adv: Fix netlink dumping of BLA backbones
+Subject: batman-adv: Fix netlink dumping of BLA backbones
 
 The function batadv_bla_backbone_dump_bucket must be able to handle
 non-complete dumps of a single bucket. It tries to do that by saving the
@@ -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/29e4759e49f06014b84791397ebe1b22546edd2d
----
- net/batman-adv/bridge_loop_avoidance.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
 index 4784469cadd4364b6239ce9ff0d1c7cc254de439..aecf34503e95d9aa723449ddbf0bb3035336b878 100644

batman-adv/patches/0030-batman-adv-Fix-internal-interface-indices-types.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Tue, 26 Dec 2017 15:14:01 +0100
-Subject: [PATCH] batman-adv: Fix internal interface indices types
+Subject: batman-adv: Fix internal interface indices types
 
 batman-adv uses internal indices for each enabled and active interface.
 It is currently used by the B.A.T.M.A.N. IV algorithm to identifify the
@@ -31,13 +31,6 @@ Signed-off-by: Sven Eckelmann <sven@narfation.org>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: backport, https://git.open-mesh.org/batman-adv.git/commit/d5db560de1352d3ec6933bca25b3aaad7ddd15e1
----
- net/batman-adv/bat_iv_ogm.c     | 24 ++++++++++++++----------
- net/batman-adv/hard-interface.c |  9 +++++++--
- net/batman-adv/originator.c     |  4 ++--
- net/batman-adv/originator.h     |  4 ++--
- net/batman-adv/types.h          | 11 ++++++-----
- 5 files changed, 31 insertions(+), 21 deletions(-)
 
 diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
 index 1847898906d495980a71eb6a0e5a7b510e55d003..bf389adbb2694746d6397a0a38353cdcd8008899 100644

batman-adv/patches/0031-batman-adv-Fix-multicast-packet-loss-with-a-single-W.patch

@@ -1,6 +1,6 @@
 From: Linus Lüssing <linus.luessing@c0d3.blue>
 Date: Sun, 4 Mar 2018 13:08:17 +0100
-Subject: [PATCH] batman-adv: Fix multicast packet loss with a single WANT_ALL_IPV4/6 flag
+Subject: batman-adv: Fix multicast packet loss with a single WANT_ALL_IPV4/6 flag
 
 As the kernel doc describes too the code is supposed to skip adding
 multicast TT entries if both the WANT_ALL_IPV4 and WANT_ALL_IPV6 flags
@@ -17,9 +17,6 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/edba00d56efb1d55cdd40957e010fba80580b5e2
----
- net/batman-adv/multicast.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
 index 090a69fc342eac8a0b6bf89556d2b32523817d09..1fb4f87be11e984f3a839c0b2dea939cd692b04d 100644

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

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

batman-adv/patches/0034-batman-adv-Fix-skbuff-rcsum-on-packet-reroute.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Sun, 18 Mar 2018 13:12:01 +0100
-Subject: [PATCH] batman-adv: Fix skbuff rcsum on packet reroute
+Subject: batman-adv: Fix skbuff rcsum on packet reroute
 
 batadv_check_unicast_ttvn may redirect a packet to itself or another
 originator. This involves rewriting the ttvn and the destination address in
@@ -13,9 +13,6 @@ Fixes: cea194d90b11 ("batman-adv: improved client announcement mechanism")
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: backport, https://git.open-mesh.org/batman-adv.git/commit/fb91b0ef84738102807e5dd7ec0b3565415aff56
----
- net/batman-adv/routing.c | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
 
 diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
 index 8d927931017e53d285d9c64b4b850bb1d0388e11..6a12612463127f501ad6a0df20632f14586075bd 100644

batman-adv/patches/0035-batman-adv-fix-multicast-via-unicast-transmission-wi.patch

@@ -1,6 +1,6 @@
 From: Linus Lüssing <linus.luessing@c0d3.blue>
 Date: Tue, 20 Mar 2018 03:13:27 +0100
-Subject: [PATCH] batman-adv: fix multicast-via-unicast transmission with AP isolation
+Subject: batman-adv: fix multicast-via-unicast transmission with AP isolation
 
 For multicast frames AP isolation is only supposed to be checked on
 the receiving nodes and never on the originating one.
@@ -21,9 +21,6 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/67a50c93bceb534937d6a188eded79272ff6d55d
----
- net/batman-adv/multicast.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
 index 1fb4f87be11e984f3a839c0b2dea939cd692b04d..20680e1dafc46cd60766a6dcd4f401f097ad4786 100644

batman-adv/patches/0036-batman-adv-fix-packet-loss-for-broadcasted-DHCP-pack.patch

@@ -1,6 +1,6 @@
 From: Linus Lüssing <linus.luessing@c0d3.blue>
 Date: Thu, 22 Mar 2018 00:21:32 +0100
-Subject: [PATCH] batman-adv: fix packet loss for broadcasted DHCP packets to a server
+Subject: batman-adv: fix packet loss for broadcasted DHCP packets to a server
 
 DHCP connectivity issues can currently occur if the following conditions
 are met:
@@ -53,9 +53,6 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/49b2132f0fe2753a3b46103db9719898c5cd44aa
----
- net/batman-adv/gateway_client.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
 index 52b8bd6ec43183519a63483950c2e886e47a6f9e..f1fdf4e7f5c3ce7f20339dcee3b6e43290ea3b4e 100644

batman-adv/patches/0037-batman-adv-Avoid-race-in-TT-TVLV-allocator-helper.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Wed, 9 May 2018 21:07:40 +0200
-Subject: [PATCH] batman-adv: Avoid race in TT TVLV allocator helper
+Subject: batman-adv: Avoid race in TT TVLV allocator helper
 
 The functions batadv_tt_prepare_tvlv_local_data and
 batadv_tt_prepare_tvlv_global_data are responsible for preparing a buffer
@@ -29,9 +29,6 @@ Signed-off-by: Sven Eckelmann <sven@narfation.org>
 Acked-by: Antonio Quartulli <a@unstable.cc>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/286be89a33497ba9000aa5c2960f1f4114953522
----
- net/batman-adv/translation-table.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
 index a64003b824e0d0b05f0a9e44ccc32ba0cb3018fc..933ac64b5707846ddee9f828b538ade86b968986 100644

batman-adv/patches/0038-batman-adv-Fix-TT-sync-flags-for-intermediate-TT-res.patch

@@ -1,6 +1,6 @@
 From: Linus Lüssing <linus.luessing@c0d3.blue>
 Date: Thu, 10 May 2018 19:44:28 +0200
-Subject: [PATCH] batman-adv: Fix TT sync flags for intermediate TT responses
+Subject: batman-adv: Fix TT sync flags for intermediate TT responses
 
 The previous TT sync fix so far only fixed TT responses issued by the
 target node directly. So far, TT responses issued by intermediate nodes
@@ -19,9 +19,6 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: backport, https://git.open-mesh.org/batman-adv.git/commit/d65daee8617b29c1ddcc949ce3a5ec24f7a1e1af
----
- net/batman-adv/translation-table.c | 61 +++++++++++++++++++++++++-----
- 1 file changed, 51 insertions(+), 10 deletions(-)
 
 diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
 index 933ac64b5707846ddee9f828b538ade86b968986..94527e5e859dcdb443b2fc9c3fbbe06aae3b4a08 100644

batman-adv/patches/0039-batman-adv-prevent-TT-request-storms-by-not-sending-.patch

@@ -1,6 +1,6 @@
 From: Marek Lindner <mareklindner@neomailbox.ch>
 Date: Sat, 12 May 2018 00:23:07 +0800
-Subject: [PATCH] batman-adv: prevent TT request storms by not sending inconsistent TT TLVLs
+Subject: batman-adv: prevent TT request storms by not sending inconsistent TT TLVLs
 
 A translation table TVLV changset sent with an OGM consists
 of a number of headers (one per VLAN) plus the changeset
@@ -23,9 +23,6 @@ Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/e4687b4be274da6180fc15b327419851fb681ec9
----
- net/batman-adv/translation-table.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
 
 diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
 index 94527e5e859dcdb443b2fc9c3fbbe06aae3b4a08..743963bf39dca73f7554f9f85fffd57fd6a3c963 100644

batman-adv/patches/0040-batman-adv-Fix-bat_ogm_iv-best-gw-refcnt-after-netli.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Sat, 2 Jun 2018 17:26:34 +0200
-Subject: [PATCH] batman-adv: Fix bat_ogm_iv best gw refcnt after netlink dump
+Subject: batman-adv: Fix bat_ogm_iv best gw refcnt after netlink dump
 
 A reference for the best gateway is taken when the list of gateways in the
 mesh is sent via netlink. This is necessary to check whether the currently
@@ -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/46360d203c627e71a27d1f8f551c819c7f2353fd
----
- net/batman-adv/bat_iv_ogm.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
 index bf389adbb2694746d6397a0a38353cdcd8008899..f0174a17b30d14e5c127106b364b8fbc8ec384ee 100644

batman-adv/patches/0041-batman-adv-Fix-bat_v-best-gw-refcnt-after-netlink-du.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Sat, 2 Jun 2018 17:26:35 +0200
-Subject: [PATCH] batman-adv: Fix bat_v best gw refcnt after netlink dump
+Subject: batman-adv: Fix bat_v best gw refcnt after netlink dump
 
 A reference for the best gateway is taken when the list of gateways in the
 mesh is sent via netlink. This is necessary to check whether the currently
@@ -17,9 +17,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/2b422b5808183d1084b450b89d9a085a13dd6d2c
----
- net/batman-adv/bat_v.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
 index 0488063ff6ac5985e27c3a0df41ab3566b48abb8..87f06e92270b4c51376bc4e9717b0aed8c9f3441 100644

batman-adv/patches/0042-batman-adv-Fix-debugfs-path-for-renamed-hardif.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Fri, 1 Jun 2018 19:24:23 +0200
-Subject: [PATCH] batman-adv: Fix debugfs path for renamed hardif
+Subject: batman-adv: Fix debugfs path for renamed hardif
 
 batman-adv is creating special debugfs directories in the init
 net_namespace for each valid hard-interface (net_device). But it is
@@ -27,11 +27,6 @@ Reported-by: John Soros <sorosj@gmail.com>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: backport, https://git.open-mesh.org/batman-adv.git/commit/127086f503f6495518b95455efebee33d328f335
----
- net/batman-adv/debugfs.c        | 20 ++++++++++++++++++++
- net/batman-adv/debugfs.h        |  6 ++++++
- net/batman-adv/hard-interface.c |  3 +++
- 3 files changed, 29 insertions(+)
 
 diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c
 index 77925504379dac7d64777393ddae326b5d6d9505..a229d2d9acfd1f3d6fea071aa0df3bf06a0e2ecf 100644

batman-adv/patches/0043-batman-adv-Fix-debugfs-path-for-renamed-softif.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Fri, 1 Jun 2018 19:24:24 +0200
-Subject: [PATCH] batman-adv: Fix debugfs path for renamed softif
+Subject: batman-adv: Fix debugfs path for renamed softif
 
 batman-adv is creating special debugfs directories in the init
 net_namespace for each created soft-interface (batadv net_device). But it
@@ -25,11 +25,6 @@ Fixes: 230202d4b530 ("batman-adv: Move device for icmp injection to debugfs")
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: backport, https://git.open-mesh.org/batman-adv.git/commit/3f2237bb191cd17654a4d5a5badfd6e7379c4b37
----
- net/batman-adv/debugfs.c        | 20 +++++++++++++++++++
- net/batman-adv/debugfs.h        |  5 +++++
- net/batman-adv/hard-interface.c | 34 +++++++++++++++++++++++++++------
- 3 files changed, 53 insertions(+), 6 deletions(-)
 
 diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c
 index a229d2d9acfd1f3d6fea071aa0df3bf06a0e2ecf..fa396394edd02e74f49323216027f4ef9739dfa0 100644

batman-adv/patches/0044-batman-adv-Avoid-storing-non-TT-sync-flags-on-singul.patch

@@ -1,6 +1,6 @@
 From: Linus Lüssing <linus.luessing@c0d3.blue>
 Date: Thu, 7 Jun 2018 00:46:23 +0200
-Subject: [PATCH] batman-adv: Avoid storing non-TT-sync flags on singular entries too
+Subject: batman-adv: Avoid storing non-TT-sync flags on singular entries too
 
 Since commit 382d020fe3fa ("batman-adv: fix TT sync flag inconsistencies")
 TT sync flags and TT non-sync'd flags are supposed to be stored
@@ -17,9 +17,6 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/beb6246b2339852b6a429ae9259a8eb30a685041
----
- net/batman-adv/translation-table.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
 index 743963bf39dca73f7554f9f85fffd57fd6a3c963..a8b4d9bcb318656022a30f742ede4f38a646d0d1 100644

batman-adv/patches/0045-batman-adv-Fix-multicast-TT-issues-with-bogus-ROAM-f.patch

@@ -1,6 +1,6 @@
 From: Linus Lüssing <linus.luessing@c0d3.blue>
 Date: Thu, 7 Jun 2018 00:46:24 +0200
-Subject: [PATCH] batman-adv: Fix multicast TT issues with bogus ROAM flags
+Subject: batman-adv: Fix multicast TT issues with bogus ROAM flags
 
 When a (broken) node wrongly sends multicast TT entries with a ROAM
 flag then this causes any receiving node to drop all entries for the
@@ -16,9 +16,6 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/c7054ffae0c3b08bb4bef3cffee1e0a543e14096
----
- 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 a8b4d9bcb318656022a30f742ede4f38a646d0d1..143a00f90d1d925aad7113f897d06f435f28dcd8 100644

batman-adv/patches/0046-batman-adv-Avoid-probe-ELP-information-leak.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Fri, 31 Aug 2018 15:08:44 +0200
-Subject: [PATCH] batman-adv: Avoid probe ELP information leak
+Subject: batman-adv: Avoid probe ELP information leak
 
 The probe ELPs for WiFi interfaces are expanded to contain at least
 BATADV_ELP_MIN_PROBE_SIZE bytes. This is usually a lot more than the
@@ -16,9 +16,6 @@ Signed-off-by: Sven Eckelmann <sven@narfation.org>
 Acked-by: Antonio Quartulli <a@unstable.cc>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/6c876e572f592c31132a55b5fb8427e168e5fb3c
----
- net/batman-adv/bat_v_elp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
 index 06b2924f4cb7dde54bab97ad2d28aecd9b1a4ceb..e988a14f3eb01de1f52fe6dcaa91af898060140e 100644

batman-adv/patches/0047-batman-adv-Fix-segfault-when-writing-to-throughput_o.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Fri, 31 Aug 2018 16:46:47 +0200
-Subject: [PATCH] batman-adv: Fix segfault when writing to throughput_override
+Subject: batman-adv: Fix segfault when writing to throughput_override
 
 The per hardif sysfs file "batman_adv/throughput_override" prints the
 resulting change as info text when the users writes to this file. It uses
@@ -23,9 +23,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/ddf99b78e255530cbadc0f67656a549e19520280
----
- net/batman-adv/sysfs.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
 index 17c844196eb26c9faf9fd543b88cd86cc1c2c029..ae22db3d6637dde2fcc238826a624ef2d6dbd8f5 100644

batman-adv/patches/0048-batman-adv-Fix-segfault-when-writing-to-sysfs-elp_in.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Fri, 31 Aug 2018 16:56:29 +0200
-Subject: [PATCH] batman-adv: Fix segfault when writing to sysfs elp_interval
+Subject: batman-adv: Fix segfault when writing to sysfs elp_interval
 
 The per hardif sysfs file "batman_adv/elp_interval" is using the generic
 functions to store/show uint values. The helper __batadv_store_uint_attr
@@ -24,9 +24,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/848be9859b0109a6e428f92f21f2e660153b1c75
----
- net/batman-adv/sysfs.c | 25 +++++++++++++++++--------
- 1 file changed, 17 insertions(+), 8 deletions(-)
 
 diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
 index ae22db3d6637dde2fcc238826a624ef2d6dbd8f5..a4e6f158de26dea0e8e3fefd5b9aeec3dcd64457 100644

batman-adv/patches/0049-batman-adv-fix-backbone_gw-refcount-on-queue_work-fa.patch

@@ -1,6 +1,6 @@
 From: Marek Lindner <mareklindner@neomailbox.ch>
 Date: Fri, 7 Sep 2018 05:45:54 +0800
-Subject: [PATCH] batman-adv: fix backbone_gw refcount on queue_work() failure
+Subject: batman-adv: fix backbone_gw refcount on queue_work() failure
 
 The backbone_gw refcounter is to be decreased by the queued work and
 currently is never decreased if the queue_work() call fails.
@@ -11,9 +11,6 @@ Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/24d83a50421c1c5d39cd9c015516a1a293ae8d0c
----
- net/batman-adv/bridge_loop_avoidance.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
 index aecf34503e95d9aa723449ddbf0bb3035336b878..258a74fd1c237fbf1b81dfc1c48720d8359b0ecc 100644

batman-adv/patches/0050-batman-adv-fix-hardif_neigh-refcount-on-queue_work-f.patch

@@ -1,6 +1,6 @@
 From: Marek Lindner <mareklindner@neomailbox.ch>
 Date: Fri, 7 Sep 2018 05:45:55 +0800
-Subject: [PATCH] batman-adv: fix hardif_neigh refcount on queue_work() failure
+Subject: batman-adv: fix hardif_neigh refcount on queue_work() failure
 
 The hardif_neigh refcounter is to be decreased by the queued work and
 currently is never decreased if the queue_work() call fails.
@@ -11,9 +11,6 @@ Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/85100b602c127cecf1bcfd620d20eb867d685df2
----
- net/batman-adv/bat_v_elp.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
 index e988a14f3eb01de1f52fe6dcaa91af898060140e..2ec0ecab0493ff88fdc01e55c8557de5b772e8bf 100644

batman-adv/patches/0051-batman-adv-Prevent-duplicated-gateway_node-entry.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Thu, 6 Sep 2018 14:35:24 +0200
-Subject: [PATCH] batman-adv: Prevent duplicated gateway_node entry
+Subject: batman-adv: Prevent duplicated gateway_node entry
 
 The function batadv_gw_node_add is responsible for adding new gw_node to
 the gateway_list. It is expecting that the caller already checked that
@@ -18,9 +18,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/69b3ca714eba608fe79a51ccd89ce7050ee0b770
----
- net/batman-adv/gateway_client.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
 index f1fdf4e7f5c3ce7f20339dcee3b6e43290ea3b4e..a6f5a3969529745d6efa1d43a89440745e1926ad 100644

batman-adv/patches/0052-batman-adv-Prevent-duplicated-nc_node-entry.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Thu, 6 Sep 2018 14:35:25 +0200
-Subject: [PATCH] batman-adv: Prevent duplicated nc_node entry
+Subject: batman-adv: Prevent duplicated nc_node entry
 
 The function batadv_nc_get_nc_node is responsible for adding new nc_nodes
 to the in_coding_list and out_coding_list. It first checks whether the
@@ -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/bab8447ad1850b25188f9652c0c52f8e58acd656
----
- net/batman-adv/network-coding.c | 41 ++++++++++++++++++---------------
- 1 file changed, 22 insertions(+), 19 deletions(-)
 
 diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
 index ab5a3bf0765f36f2fe14ff4a91d43d905e08a1f3..3279f7f3b97fd56535071b857cebebd68a5b3484 100644

batman-adv/patches/0053-batman-adv-Prevent-duplicated-softif_vlan-entry.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Thu, 6 Sep 2018 14:35:26 +0200
-Subject: [PATCH] batman-adv: Prevent duplicated softif_vlan entry
+Subject: batman-adv: Prevent duplicated softif_vlan entry
 
 The function batadv_softif_vlan_get is responsible for adding new
 softif_vlan to the softif_vlan_list. It first checks whether the entry
@@ -18,9 +18,6 @@ Fixes: 952cebb57518 ("batman-adv: add per VLAN interface attribute framework")
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/023d3f64207e8b6a6e6d0718d98e239c5545ef0c
----
- net/batman-adv/soft-interface.c | 27 +++++++++++++++++++--------
- 1 file changed, 19 insertions(+), 8 deletions(-)
 
 diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
 index 5da1a1c0f1efb5d95f31bc852b899f61e462feb1..ff797f32fb3bb81dafe1e7d3e9c6307e6a5aaff1 100644

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

batman-adv/patches/0055-batman-adv-Prevent-duplicated-tvlv-handler.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Thu, 6 Sep 2018 14:35:28 +0200
-Subject: [PATCH] batman-adv: Prevent duplicated tvlv handler
+Subject: batman-adv: Prevent duplicated tvlv handler
 
 The function batadv_tvlv_handler_register is responsible for adding new
 tvlv_handler to the handler_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/acabad79e01740525cf4ff8ce6e9a210b683d420
----
- net/batman-adv/tvlv.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/net/batman-adv/tvlv.c b/net/batman-adv/tvlv.c
 index a783420356ae0cd4a6273b3b7a04781242e37a82..1eccc49a793004db82346f9dc3be7fcc2386417b 100644

batman-adv/patches/0056-batman-adv-Use-explicit-tvlv-padding-for-ELP-packets.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Tue, 30 Oct 2018 12:17:10 +0100
-Subject: [PATCH] batman-adv: Use explicit tvlv padding for ELP packets
+Subject: batman-adv: Use explicit tvlv padding for ELP packets
 
 The announcement messages of batman-adv COMPAT_VERSION 15 have the
 possibility to announce additional information via a dynamic TVLV part.
@@ -21,9 +21,6 @@ Reported-by: Linus Lüssing <linus.luessing@c0d3.blue>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: backport, https://git.open-mesh.org/batman-adv.git/commit/974337ee9773c4bd0a2d5c322306cf2bea445e11
----
- net/batman-adv/bat_v_elp.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
 index 2ec0ecab0493ff88fdc01e55c8557de5b772e8bf..08c0809fca7de1fe51727652a2e870ddfa74dc13 100644

batman-adv/patches/0057-batman-adv-Expand-merged-fragment-buffer-for-full-pa.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Wed, 7 Nov 2018 23:09:12 +0100
-Subject: [PATCH] batman-adv: Expand merged fragment buffer for full packet
+Subject: batman-adv: Expand merged fragment buffer for full packet
 
 The complete size ("total_size") of the fragmented packet is stored in the
 fragment header and in the size of the fragment chain. When the fragments
@@ -25,9 +25,6 @@ Co-authored-by: Linus Lüssing <linus.luessing@c0d3.blue>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: other, https://patchwork.open-mesh.org/patch/17616/
----
- net/batman-adv/fragmentation.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
 index 5969d3705ec08a96438ecce06577d35291600753..f6a5196d0370517716dfc9e1f80fb878a068801d 100644

batman-adv/patches/0058-batman-adv-Avoid-WARN-on-net_device-without-parent-i.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Sun, 30 Dec 2018 12:46:01 +0100
-Subject: [PATCH] batman-adv: Avoid WARN on net_device without parent in netns
+Subject: batman-adv: Avoid WARN on net_device without parent in netns
 
 It is not allowed to use WARN* helpers on potential incorrect input from
 the user or transient problems because systems configured as panic_on_warn
@@ -18,9 +18,6 @@ Reported-by: Dmitry Vyukov <dvyukov@google.com>
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/59ad04405be86f648fd83d81d2fd0a78f215a43b
----
- net/batman-adv/hard-interface.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
 index 23d3893264f989c9740e68d83f6db300dee20dc3..c9a3b7bc07bcc443281c4f12c750c4d925c3b2c3 100644

batman-adv/patches/0059-batman-adv-Force-mac-header-to-start-of-data-on-xmit.patch

@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Mon, 31 Dec 2018 22:46:09 +0100
-Subject: [PATCH] batman-adv: Force mac header to start of data on xmit
+Subject: batman-adv: Force mac header to start of data on xmit
 
 The caller of ndo_start_xmit may not already have called
 skb_reset_mac_header. The returned value of skb_mac_header/eth_hdr
@@ -20,9 +20,6 @@ Reported-by: syzbot+7d20bc3f1ddddc0f9079@syzkaller.appspotmail.com
 Signed-off-by: Sven Eckelmann <sven@narfation.org>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/74c4b0c50f19f986752ee18ed393732f4eed7a66
----
- net/batman-adv/soft-interface.c | 2 ++
- 1 file changed, 2 insertions(+)
 
 diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
 index ff797f32fb3bb81dafe1e7d3e9c6307e6a5aaff1..f590c7b2c76816303fe1d3f5d2858e3a9b126539 100644

batman-adv/patches/0060-batman-adv-fix-uninit-value-in-batadv_interface_tx.patch

@@ -0,0 +1,95 @@
+From: Eric Dumazet <edumazet@google.com>
+Date: Mon, 11 Feb 2019 14:41:22 -0800
+Subject: batman-adv: fix uninit-value in batadv_interface_tx()
+
+KMSAN reported batadv_interface_tx() was possibly using a
+garbage value [1]
+
+batadv_get_vid() does have a pskb_may_pull() call
+but batadv_interface_tx() does not actually make sure
+this did not fail.
+
+[1]
+BUG: KMSAN: uninit-value in batadv_interface_tx+0x908/0x1e40 net/batman-adv/soft-interface.c:231
+CPU: 0 PID: 10006 Comm: syz-executor469 Not tainted 4.20.0-rc7+ #5
+Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
+Call Trace:
+ __dump_stack lib/dump_stack.c:77 [inline]
+ dump_stack+0x173/0x1d0 lib/dump_stack.c:113
+ kmsan_report+0x12e/0x2a0 mm/kmsan/kmsan.c:613
+ __msan_warning+0x82/0xf0 mm/kmsan/kmsan_instr.c:313
+ batadv_interface_tx+0x908/0x1e40 net/batman-adv/soft-interface.c:231
+ __netdev_start_xmit include/linux/netdevice.h:4356 [inline]
+ netdev_start_xmit include/linux/netdevice.h:4365 [inline]
+ xmit_one net/core/dev.c:3257 [inline]
+ dev_hard_start_xmit+0x607/0xc40 net/core/dev.c:3273
+ __dev_queue_xmit+0x2e42/0x3bc0 net/core/dev.c:3843
+ dev_queue_xmit+0x4b/0x60 net/core/dev.c:3876
+ packet_snd net/packet/af_packet.c:2928 [inline]
+ packet_sendmsg+0x8306/0x8f30 net/packet/af_packet.c:2953
+ sock_sendmsg_nosec net/socket.c:621 [inline]
+ sock_sendmsg net/socket.c:631 [inline]
+ __sys_sendto+0x8c4/0xac0 net/socket.c:1788
+ __do_sys_sendto net/socket.c:1800 [inline]
+ __se_sys_sendto+0x107/0x130 net/socket.c:1796
+ __x64_sys_sendto+0x6e/0x90 net/socket.c:1796
+ do_syscall_64+0xbc/0xf0 arch/x86/entry/common.c:291
+ entry_SYSCALL_64_after_hwframe+0x63/0xe7
+RIP: 0033:0x441889
+Code: 18 89 d0 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 bb 10 fc ff c3 66 2e 0f 1f 84 00 00 00 00
+RSP: 002b:00007ffdda6fd468 EFLAGS: 00000216 ORIG_RAX: 000000000000002c
+RAX: ffffffffffffffda RBX: 0000000000000002 RCX: 0000000000441889
+RDX: 000000000000000e RSI: 00000000200000c0 RDI: 0000000000000003
+RBP: 0000000000000003 R08: 0000000000000000 R09: 0000000000000000
+R10: 0000000000000000 R11: 0000000000000216 R12: 00007ffdda6fd4c0
+R13: 00007ffdda6fd4b0 R14: 0000000000000000 R15: 0000000000000000
+
+Uninit was created at:
+ kmsan_save_stack_with_flags mm/kmsan/kmsan.c:204 [inline]
+ kmsan_internal_poison_shadow+0x92/0x150 mm/kmsan/kmsan.c:158
+ kmsan_kmalloc+0xa6/0x130 mm/kmsan/kmsan_hooks.c:176
+ kmsan_slab_alloc+0xe/0x10 mm/kmsan/kmsan_hooks.c:185
+ slab_post_alloc_hook mm/slab.h:446 [inline]
+ slab_alloc_node mm/slub.c:2759 [inline]
+ __kmalloc_node_track_caller+0xe18/0x1030 mm/slub.c:4383
+ __kmalloc_reserve net/core/skbuff.c:137 [inline]
+ __alloc_skb+0x309/0xa20 net/core/skbuff.c:205
+ alloc_skb include/linux/skbuff.h:998 [inline]
+ alloc_skb_with_frags+0x1c7/0xac0 net/core/skbuff.c:5220
+ sock_alloc_send_pskb+0xafd/0x10e0 net/core/sock.c:2083
+ packet_alloc_skb net/packet/af_packet.c:2781 [inline]
+ packet_snd net/packet/af_packet.c:2872 [inline]
+ packet_sendmsg+0x661a/0x8f30 net/packet/af_packet.c:2953
+ sock_sendmsg_nosec net/socket.c:621 [inline]
+ sock_sendmsg net/socket.c:631 [inline]
+ __sys_sendto+0x8c4/0xac0 net/socket.c:1788
+ __do_sys_sendto net/socket.c:1800 [inline]
+ __se_sys_sendto+0x107/0x130 net/socket.c:1796
+ __x64_sys_sendto+0x6e/0x90 net/socket.c:1796
+ do_syscall_64+0xbc/0xf0 arch/x86/entry/common.c:291
+ entry_SYSCALL_64_after_hwframe+0x63/0xe7
+
+Fixes: 48628bb9419f ("batman-adv: softif bridge loop avoidance")
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Reported-by: syzbot <syzkaller@googlegroups.com>
+Cc:	Marek Lindner <mareklindner@neomailbox.ch>
+Cc:	Simon Wunderlich <sw@simonwunderlich.de>
+Cc:	Antonio Quartulli <a@unstable.cc>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+
+Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/35482922b38bb5f5b03b0e92bc58cec2b7c77cdf
+
+diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
+index f590c7b2c76816303fe1d3f5d2858e3a9b126539..2cb0eee29e95ef67d3a8157226904caf57da87ab 100644
+--- a/net/batman-adv/soft-interface.c
++++ b/net/batman-adv/soft-interface.c
+@@ -238,6 +238,8 @@ static int batadv_interface_tx(struct sk_buff *skb,
+ 
+ 	switch (ntohs(ethhdr->h_proto)) {
+ 	case ETH_P_8021Q:
++		if (!pskb_may_pull(skb, sizeof(*vhdr)))
++			goto dropped;
+ 		vhdr = vlan_eth_hdr(skb);
+ 
+ 		/* drop batman-in-batman packets to prevent loops */

batman-adv/patches/0061-batman-adv-Reduce-claim-hash-refcnt-only-for-removed.patch

@@ -0,0 +1,65 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Sat, 23 Feb 2019 15:09:04 +0100
+Subject: batman-adv: Reduce claim hash refcnt only for removed entry
+
+The batadv_hash_remove is a function which searches the hashtable for an
+entry using a needle, a hashtable bucket selection function and a compare
+function. It will lock the bucket list and delete an entry when the compare
+function matches it with the needle. It returns the pointer to the
+hlist_node which matches or NULL when no entry matches the needle.
+
+The batadv_bla_del_claim is not itself protected in anyway to avoid that
+any other function is modifying the hashtable between the search for the
+entry and the call to batadv_hash_remove. It can therefore happen that the
+entry either doesn't exist anymore or an entry was deleted which is not the
+same object as the needle. In such an situation, the reference counter (for
+the reference stored in the hashtable) must not be reduced for the needle.
+Instead the reference counter of the actually removed entry has to be
+reduced.
+
+Otherwise the reference counter will underflow and the object might be
+freed before all its references were dropped. The kref helpers reported
+this problem as:
+
+  refcount_t: underflow; use-after-free.
+
+Fixes: a9ce0dc43e2c ("batman-adv: add basic bridge loop avoidance code")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+
+Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/3a7af70ae7c4209324dbb08b91e013c17108bdd6
+
+diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
+index 258a74fd1c237fbf1b81dfc1c48720d8359b0ecc..f79bb7751278a27d34131f1d4dba85cb10735093 100644
+--- a/net/batman-adv/bridge_loop_avoidance.c
++++ b/net/batman-adv/bridge_loop_avoidance.c
+@@ -802,6 +802,8 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv,
+ 				 const u8 *mac, const unsigned short vid)
+ {
+ 	struct batadv_bla_claim search_claim, *claim;
++	struct batadv_bla_claim *claim_removed_entry;
++	struct hlist_node *claim_removed_node;
+ 
+ 	ether_addr_copy(search_claim.addr, mac);
+ 	search_claim.vid = vid;
+@@ -812,10 +814,18 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv,
+ 	batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_del_claim(): %pM, vid %d\n",
+ 		   mac, BATADV_PRINT_VID(vid));
+ 
+-	batadv_hash_remove(bat_priv->bla.claim_hash, batadv_compare_claim,
+-			   batadv_choose_claim, claim);
+-	batadv_claim_put(claim); /* reference from the hash is gone */
++	claim_removed_node = batadv_hash_remove(bat_priv->bla.claim_hash,
++						batadv_compare_claim,
++						batadv_choose_claim, claim);
++	if (!claim_removed_node)
++		goto free_claim;
+ 
++	/* reference from the hash is gone */
++	claim_removed_entry = hlist_entry(claim_removed_node,
++					  struct batadv_bla_claim, hash_entry);
++	batadv_claim_put(claim_removed_entry);
++
++free_claim:
+ 	/* don't need the reference from hash_find() anymore */
+ 	batadv_claim_put(claim);
+ }

batman-adv/patches/0062-batman-adv-Reduce-tt_local-hash-refcnt-only-for-remo.patch

@@ -0,0 +1,69 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Sat, 23 Feb 2019 15:09:05 +0100
+Subject: batman-adv: Reduce tt_local hash refcnt only for removed entry
+
+The batadv_hash_remove is a function which searches the hashtable for an
+entry using a needle, a hashtable bucket selection function and a compare
+function. It will lock the bucket list and delete an entry when the compare
+function matches it with the needle. It returns the pointer to the
+hlist_node which matches or NULL when no entry matches the needle.
+
+The batadv_tt_local_remove is not itself protected in anyway to avoid that
+any other function is modifying the hashtable between the search for the
+entry and the call to batadv_hash_remove. It can therefore happen that the
+entry either doesn't exist anymore or an entry was deleted which is not the
+same object as the needle. In such an situation, the reference counter (for
+the reference stored in the hashtable) must not be reduced for the needle.
+Instead the reference counter of the actually removed entry has to be
+reduced.
+
+Otherwise the reference counter will underflow and the object might be
+freed before all its references were dropped. The kref helpers reported
+this problem as:
+
+  refcount_t: underflow; use-after-free.
+
+Fixes: af912d77181f ("batman-adv: protect tt_local_entry from concurrent delete events")
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+
+Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/0c86a0511e97de502276900c5d6f22b09e042d21
+
+diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
+index b32853cbab028f0a052492545bb803efdcdb0ff3..d30e86dc5ad64e5de9487224b802d6fbdcf5f440 100644
+--- a/net/batman-adv/translation-table.c
++++ b/net/batman-adv/translation-table.c
+@@ -1322,9 +1322,10 @@ u16 batadv_tt_local_remove(struct batadv_priv *bat_priv, const u8 *addr,
+ 			   unsigned short vid, const char *message,
+ 			   bool roaming)
+ {
++	struct batadv_tt_local_entry *tt_removed_entry;
+ 	struct batadv_tt_local_entry *tt_local_entry;
+ 	u16 flags, curr_flags = BATADV_NO_FLAGS;
+-	void *tt_entry_exists;
++	struct hlist_node *tt_removed_node;
+ 
+ 	tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr, vid);
+ 	if (!tt_local_entry)
+@@ -1353,15 +1354,18 @@ u16 batadv_tt_local_remove(struct batadv_priv *bat_priv, const u8 *addr,
+ 	 */
+ 	batadv_tt_local_event(bat_priv, tt_local_entry, BATADV_TT_CLIENT_DEL);
+ 
+-	tt_entry_exists = batadv_hash_remove(bat_priv->tt.local_hash,
++	tt_removed_node = batadv_hash_remove(bat_priv->tt.local_hash,
+ 					     batadv_compare_tt,
+ 					     batadv_choose_tt,
+ 					     &tt_local_entry->common);
+-	if (!tt_entry_exists)
++	if (!tt_removed_node)
+ 		goto out;
+ 
+-	/* extra call to free the local tt entry */
+-	batadv_tt_local_entry_put(tt_local_entry);
++	/* drop reference of remove hash entry */
++	tt_removed_entry = hlist_entry(tt_removed_node,
++				       struct batadv_tt_local_entry,
++				       common.hash_entry);
++	batadv_tt_local_entry_put(tt_removed_entry);
+ 
+ out:
+ 	if (tt_local_entry)

batman-adv/patches/0063-batman-adv-Reduce-tt_global-hash-refcnt-only-for-rem.patch

@@ -0,0 +1,66 @@
+From: Sven Eckelmann <sven@narfation.org>
+Date: Sat, 23 Feb 2019 15:09:06 +0100
+Subject: batman-adv: Reduce tt_global hash refcnt only for removed entry
+
+The batadv_hash_remove is a function which searches the hashtable for an
+entry using a needle, a hashtable bucket selection function and a compare
+function. It will lock the bucket list and delete an entry when the compare
+function matches it with the needle. It returns the pointer to the
+hlist_node which matches or NULL when no entry matches the needle.
+
+The batadv_tt_global_free is not itself protected in anyway to avoid that
+any other function is modifying the hashtable between the search for the
+entry and the call to batadv_hash_remove. It can therefore happen that the
+entry either doesn't exist anymore or an entry was deleted which is not the
+same object as the needle. In such an situation, the reference counter (for
+the reference stored in the hashtable) must not be reduced for the needle.
+Instead the reference counter of the actually removed entry has to be
+reduced.
+
+Otherwise the reference counter will underflow and the object might be
+freed before all its references were dropped. The kref helpers reported
+this problem as:
+
+  refcount_t: underflow; use-after-free.
+
+Fixes: 7bad46397eff ("batman-adv: protect the local and the global trans-tables with rcu")
+Reported-by: Martin Weinelt <martin@linuxlounge.net>
+Signed-off-by: Sven Eckelmann <sven@narfation.org>
+Acked-by: Antonio Quartulli <a@unstable.cc>
+
+Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/bd6df24da0063fe50828c287d05bdc1876f4f6cc
+
+diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
+index d30e86dc5ad64e5de9487224b802d6fbdcf5f440..a1b83416be842810f4ca49212c3afb91c598a64b 100644
+--- a/net/batman-adv/translation-table.c
++++ b/net/batman-adv/translation-table.c
+@@ -614,14 +614,26 @@ static void batadv_tt_global_free(struct batadv_priv *bat_priv,
+ 				  struct batadv_tt_global_entry *tt_global,
+ 				  const char *message)
+ {
++	struct batadv_tt_global_entry *tt_removed_entry;
++	struct hlist_node *tt_removed_node;
++
+ 	batadv_dbg(BATADV_DBG_TT, bat_priv,
+ 		   "Deleting global tt entry %pM (vid: %d): %s\n",
+ 		   tt_global->common.addr,
+ 		   BATADV_PRINT_VID(tt_global->common.vid), message);
+ 
+-	batadv_hash_remove(bat_priv->tt.global_hash, batadv_compare_tt,
+-			   batadv_choose_tt, &tt_global->common);
+-	batadv_tt_global_entry_put(tt_global);
++	tt_removed_node = batadv_hash_remove(bat_priv->tt.global_hash,
++					     batadv_compare_tt,
++					     batadv_choose_tt,
++					     &tt_global->common);
++	if (!tt_removed_node)
++		return;
++
++	/* drop reference of remove hash entry */
++	tt_removed_entry = hlist_entry(tt_removed_node,
++				       struct batadv_tt_global_entry,
++				       common.hash_entry);
++	batadv_tt_global_entry_put(tt_removed_entry);
+ }
+ 
+ /**