The following commit has been merged in the master branch: commit d3a5fd3c987c5e341bf78b79ef4d81080081b7d2 Merge: 962c382d482afc6280ff6f3c28331774bc331e1e 7a79d717e0817610932ce3b7b6033ea06ee1d577 Author: David S. Miller davem@davemloft.net Date: Fri Feb 1 11:04:13 2019 -0800

Merge tag 'batadv-next-for-davem-20190201' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

==================== This feature/cleanup patchset includes the following patches:

- bump version strings, by Simon Wunderlich

- Add DHCPACKs for DAT snooping, by Linus Luessing

- Update copyright years for 2019, by Sven Eckelmann ====================

Signed-off-by: David S. Miller davem@davemloft.net

diff --combined net/batman-adv/icmp_socket.c index 6d5859714f52,d34bb79e0405..9859ababb82e --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@@ -1,5 -1,5 +1,5 @@@ // SPDX-License-Identifier: GPL-2.0 - /* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: + /* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: * * Marek Lindner * @@@ -147,7 -147,7 +147,7 @@@ static ssize_t batadv_socket_read(struc if (!buf || count < sizeof(struct batadv_icmp_packet)) return -EINVAL;

- if (!access_ok(VERIFY_WRITE, buf, count)) + if (!access_ok(buf, count)) return -EFAULT;

error = wait_event_interruptible(socket_client->queue_wait, diff --combined net/batman-adv/log.c index 75f602e1ce94,f97849a8380b..3e610df8debf --- a/net/batman-adv/log.c +++ b/net/batman-adv/log.c @@@ -1,5 -1,5 +1,5 @@@ // SPDX-License-Identifier: GPL-2.0 - /* Copyright (C) 2010-2018 B.A.T.M.A.N. contributors: + /* Copyright (C) 2010-2019 B.A.T.M.A.N. contributors: * * Marek Lindner * @@@ -136,7 -136,7 +136,7 @@@ static ssize_t batadv_log_read(struct f if (count == 0) return 0;

- if (!access_ok(VERIFY_WRITE, buf, count)) + if (!access_ok(buf, count)) return -EFAULT;

error = wait_event_interruptible(debug_log->queue_wait, diff --combined net/batman-adv/multicast.c index 1dd70f048e7b,5de6a37525f5..f91b1b6265cf --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@@ -1,5 -1,5 +1,5 @@@ // SPDX-License-Identifier: GPL-2.0 - /* Copyright (C) 2014-2018 B.A.T.M.A.N. contributors: + /* Copyright (C) 2014-2019 B.A.T.M.A.N. contributors: * * Linus Lüssing * @@@ -674,7 -674,7 +674,7 @@@ static void batadv_mcast_mla_update(str */ static bool batadv_mcast_is_report_ipv4(struct sk_buff *skb) { - if (ip_mc_check_igmp(skb, NULL) < 0) + if (ip_mc_check_igmp(skb) < 0) return false;

switch (igmp_hdr(skb)->type) { @@@ -741,7 -741,7 +741,7 @@@ static int batadv_mcast_forw_mode_check */ static bool batadv_mcast_is_report_ipv6(struct sk_buff *skb) { - if (ipv6_mc_check_mld(skb, NULL) < 0) + if (ipv6_mc_check_mld(skb) < 0) return false;

switch (icmp6_hdr(skb)->icmp6_type) {