* [PATCH 0/5] pull request for net-next: batman-adv 2018-03-02 @ 2018-03-02 17:57 Simon Wunderlich [not found] ` <20180302175745.12551-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> 0 siblings, 1 reply; 22+ messages in thread From: Simon Wunderlich @ 2018-03-02 17:57 UTC (permalink / raw) To: davem-fT/PcQaiUtIeIZ0/mPfg9Q Cc: netdev-u79uwXL29TY76Z2rM5mHXA, b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r Hi David, here is a little cleanup pull request of batman-adv to go into net-next. Please pull or let me know of any problem! Thank you, Simon The following changes since commit 7928b2cbe55b2a410a0f5c1f154610059c57b1b2: Linux 4.16-rc1 (2018-02-11 15:04:29 -0800) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20180302 for you to fetch changes up to a163dc22d515d17844435c8217ff66193d35b3fa: batman-adv: always assume 2-byte packet alignment (2018-02-27 13:02:54 +0100) ---------------------------------------------------------------- This cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - bump copyright years, by Sven Eckelmann - fix macro indendation for checkpatch, by Sven Eckelmann - fix comparison operator for bool returning functions, by Sven Eckelmann - assume 2-byte packet alignments for all packet types, by Matthias Schiffer ---------------------------------------------------------------- Matthias Schiffer (1): batman-adv: always assume 2-byte packet alignment Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (3): batman-adv: Update copyright years for 2018 batman-adv: Fix indentation of batadv_seq_before batman-adv: Avoid relation operator comparison with bool include/uapi/linux/batadv_packet.h | 15 +++------------ include/uapi/linux/batman_adv.h | 2 +- net/batman-adv/Kconfig | 2 +- net/batman-adv/Makefile | 2 +- net/batman-adv/bat_algo.c | 2 +- net/batman-adv/bat_algo.h | 2 +- net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/bat_iv_ogm.h | 2 +- net/batman-adv/bat_v.c | 2 +- net/batman-adv/bat_v.h | 2 +- net/batman-adv/bat_v_elp.c | 2 +- net/batman-adv/bat_v_elp.h | 2 +- net/batman-adv/bat_v_ogm.c | 2 +- net/batman-adv/bat_v_ogm.h | 2 +- net/batman-adv/bitarray.c | 2 +- net/batman-adv/bitarray.h | 2 +- net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/bridge_loop_avoidance.h | 2 +- net/batman-adv/debugfs.c | 2 +- net/batman-adv/debugfs.h | 2 +- net/batman-adv/distributed-arp-table.c | 4 ++-- net/batman-adv/distributed-arp-table.h | 2 +- net/batman-adv/fragmentation.c | 2 +- net/batman-adv/fragmentation.h | 2 +- net/batman-adv/gateway_client.c | 2 +- net/batman-adv/gateway_client.h | 2 +- net/batman-adv/gateway_common.c | 2 +- net/batman-adv/gateway_common.h | 2 +- net/batman-adv/hard-interface.c | 2 +- net/batman-adv/hard-interface.h | 2 +- net/batman-adv/hash.c | 2 +- net/batman-adv/hash.h | 2 +- net/batman-adv/icmp_socket.c | 2 +- net/batman-adv/icmp_socket.h | 2 +- net/batman-adv/log.c | 2 +- net/batman-adv/log.h | 2 +- net/batman-adv/main.c | 2 +- net/batman-adv/main.h | 16 +++++++++------- net/batman-adv/multicast.c | 2 +- net/batman-adv/multicast.h | 2 +- net/batman-adv/netlink.c | 2 +- net/batman-adv/netlink.h | 2 +- net/batman-adv/network-coding.c | 2 +- net/batman-adv/network-coding.h | 2 +- net/batman-adv/originator.c | 2 +- net/batman-adv/originator.h | 2 +- net/batman-adv/routing.c | 2 +- net/batman-adv/routing.h | 2 +- net/batman-adv/send.c | 2 +- net/batman-adv/send.h | 2 +- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/soft-interface.h | 2 +- net/batman-adv/sysfs.c | 2 +- net/batman-adv/sysfs.h | 2 +- net/batman-adv/tp_meter.c | 2 +- net/batman-adv/tp_meter.h | 2 +- net/batman-adv/translation-table.c | 2 +- net/batman-adv/translation-table.h | 2 +- net/batman-adv/tvlv.c | 2 +- net/batman-adv/tvlv.h | 2 +- net/batman-adv/types.h | 2 +- 61 files changed, 72 insertions(+), 79 deletions(-) ^ permalink raw reply [flat|nested] 22+ messages in thread
[parent not found: <20180302175745.12551-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org>]
* [PATCH 1/5] batman-adv: Start new development cycle [not found] ` <20180302175745.12551-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> @ 2018-03-02 17:57 ` Simon Wunderlich 2018-03-02 17:57 ` [PATCH 2/5] batman-adv: Update copyright years for 2018 Simon Wunderlich ` (4 subsequent siblings) 5 siblings, 0 replies; 22+ messages in thread From: Simon Wunderlich @ 2018-03-02 17:57 UTC (permalink / raw) To: davem-fT/PcQaiUtIeIZ0/mPfg9Q Cc: netdev-u79uwXL29TY76Z2rM5mHXA, b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r Signed-off-by: Simon Wunderlich <sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> --- 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 f7ba3f96d8f3..69bfedfad174 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -25,7 +25,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2018.0" +#define BATADV_SOURCE_VERSION "2018.1" #endif /* B.A.T.M.A.N. parameters */ -- 2.11.0 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 2/5] batman-adv: Update copyright years for 2018 [not found] ` <20180302175745.12551-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> 2018-03-02 17:57 ` [PATCH 1/5] batman-adv: Start new development cycle Simon Wunderlich @ 2018-03-02 17:57 ` Simon Wunderlich 2018-03-02 17:57 ` [PATCH 3/5] batman-adv: Fix indentation of batadv_seq_before Simon Wunderlich ` (3 subsequent siblings) 5 siblings, 0 replies; 22+ messages in thread From: Simon Wunderlich @ 2018-03-02 17:57 UTC (permalink / raw) To: davem-fT/PcQaiUtIeIZ0/mPfg9Q Cc: netdev-u79uwXL29TY76Z2rM5mHXA, b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r From: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org> Signed-off-by: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org> Signed-off-by: Simon Wunderlich <sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> --- include/uapi/linux/batadv_packet.h | 2 +- include/uapi/linux/batman_adv.h | 2 +- net/batman-adv/Kconfig | 2 +- net/batman-adv/Makefile | 2 +- net/batman-adv/bat_algo.c | 2 +- net/batman-adv/bat_algo.h | 2 +- net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/bat_iv_ogm.h | 2 +- net/batman-adv/bat_v.c | 2 +- net/batman-adv/bat_v.h | 2 +- net/batman-adv/bat_v_elp.c | 2 +- net/batman-adv/bat_v_elp.h | 2 +- net/batman-adv/bat_v_ogm.c | 2 +- net/batman-adv/bat_v_ogm.h | 2 +- net/batman-adv/bitarray.c | 2 +- net/batman-adv/bitarray.h | 2 +- net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/bridge_loop_avoidance.h | 2 +- net/batman-adv/debugfs.c | 2 +- net/batman-adv/debugfs.h | 2 +- net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/distributed-arp-table.h | 2 +- net/batman-adv/fragmentation.c | 2 +- net/batman-adv/fragmentation.h | 2 +- net/batman-adv/gateway_client.c | 2 +- net/batman-adv/gateway_client.h | 2 +- net/batman-adv/gateway_common.c | 2 +- net/batman-adv/gateway_common.h | 2 +- net/batman-adv/hard-interface.c | 2 +- net/batman-adv/hard-interface.h | 2 +- net/batman-adv/hash.c | 2 +- net/batman-adv/hash.h | 2 +- net/batman-adv/icmp_socket.c | 2 +- net/batman-adv/icmp_socket.h | 2 +- net/batman-adv/log.c | 2 +- net/batman-adv/log.h | 2 +- net/batman-adv/main.c | 2 +- net/batman-adv/main.h | 2 +- net/batman-adv/multicast.c | 2 +- net/batman-adv/multicast.h | 2 +- net/batman-adv/netlink.c | 2 +- net/batman-adv/netlink.h | 2 +- net/batman-adv/network-coding.c | 2 +- net/batman-adv/network-coding.h | 2 +- net/batman-adv/originator.c | 2 +- net/batman-adv/originator.h | 2 +- net/batman-adv/routing.c | 2 +- net/batman-adv/routing.h | 2 +- net/batman-adv/send.c | 2 +- net/batman-adv/send.h | 2 +- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/soft-interface.h | 2 +- net/batman-adv/sysfs.c | 2 +- net/batman-adv/sysfs.h | 2 +- net/batman-adv/tp_meter.c | 2 +- net/batman-adv/tp_meter.h | 2 +- net/batman-adv/translation-table.c | 2 +- net/batman-adv/translation-table.h | 2 +- net/batman-adv/tvlv.c | 2 +- net/batman-adv/tvlv.h | 2 +- net/batman-adv/types.h | 2 +- 61 files changed, 61 insertions(+), 61 deletions(-) diff --git a/include/uapi/linux/batadv_packet.h b/include/uapi/linux/batadv_packet.h index 5cb360be2a11..daefd7283896 100644 --- a/include/uapi/linux/batadv_packet.h +++ b/include/uapi/linux/batadv_packet.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */ -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h index ae00c99cbed0..56ae28934070 100644 --- a/include/uapi/linux/batman_adv.h +++ b/include/uapi/linux/batman_adv.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: MIT */ -/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2016-2018 B.A.T.M.A.N. contributors: * * Matthias Schiffer * diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index c44f6515be5e..e4e2e02b7380 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +# Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: # # Marek Lindner, Simon Wunderlich # diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile index 022f6e77307b..b97ba6fb8353 100644 --- a/net/batman-adv/Makefile +++ b/net/batman-adv/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +# Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: # # Marek Lindner, Simon Wunderlich # diff --git a/net/batman-adv/bat_algo.c b/net/batman-adv/bat_algo.c index 80c72c7d3cad..ea309ad06175 100644 --- a/net/batman-adv/bat_algo.c +++ b/net/batman-adv/bat_algo.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h index 029221615ba3..534b790c3753 100644 --- a/net/batman-adv/bat_algo.h +++ b/net/batman-adv/bat_algo.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Linus Lüssing * diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 79e326383726..e21aa147607b 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/bat_iv_ogm.h b/net/batman-adv/bat_iv_ogm.h index 9dc0dd5c83df..317cafd302cf 100644 --- a/net/batman-adv/bat_iv_ogm.h +++ b/net/batman-adv/bat_iv_ogm.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 27e165ac9302..9c3a34b65b15 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2018 B.A.T.M.A.N. contributors: * * Linus Lüssing, Marek Lindner * diff --git a/net/batman-adv/bat_v.h b/net/batman-adv/bat_v.h index a17ab68bbce8..ec4a2a569750 100644 --- a/net/batman-adv/bat_v.h +++ b/net/batman-adv/bat_v.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Linus Lüssing * diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index a83478c46597..28687493599f 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2018 B.A.T.M.A.N. contributors: * * Linus Lüssing, Marek Lindner * diff --git a/net/batman-adv/bat_v_elp.h b/net/batman-adv/bat_v_elp.h index 5e39d0588a48..e8c7b7fd290d 100644 --- a/net/batman-adv/bat_v_elp.h +++ b/net/batman-adv/bat_v_elp.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2018 B.A.T.M.A.N. contributors: * * Linus Lüssing, Marek Lindner * diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index ba59b77c605d..2948b41b06d4 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2018 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/net/batman-adv/bat_v_ogm.h b/net/batman-adv/bat_v_ogm.h index 6a4c14ccc3c6..ed36c5e79fde 100644 --- a/net/batman-adv/bat_v_ogm.h +++ b/net/batman-adv/bat_v_ogm.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2018 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c index bdc1ef06e05b..a296a4d851f5 100644 --- a/net/batman-adv/bitarray.c +++ b/net/batman-adv/bitarray.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2018 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h index ca9d0753dd6b..48f683289531 100644 --- a/net/batman-adv/bitarray.h +++ b/net/batman-adv/bitarray.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2018 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index fad47853ad3c..8ff81346ff0c 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2018 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index b27571abcd2f..71f95a3e4d3f 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2018 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index 21d1189957a7..4229b01ac7b5 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2010-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2018 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h index 90a08d35c501..37b069698b04 100644 --- a/net/batman-adv/debugfs.h +++ b/net/batman-adv/debugfs.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2010-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2018 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 9703c791ffc5..19b15de455ab 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2018 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h index 12897eb46268..e24aa9601c52 100644 --- a/net/batman-adv/distributed-arp-table.h +++ b/net/batman-adv/distributed-arp-table.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2018 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 22dde42fd80e..d815acc13c35 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2018 B.A.T.M.A.N. contributors: * * Martin Hundebøll <martin-SHBFXCSm21MJGwgDXS7ZQA@public.gmane.org> * diff --git a/net/batman-adv/fragmentation.h b/net/batman-adv/fragmentation.h index 138b22a1836a..944512e07782 100644 --- a/net/batman-adv/fragmentation.h +++ b/net/batman-adv/fragmentation.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2013-2018 B.A.T.M.A.N. contributors: * * Martin Hundebøll <martin-SHBFXCSm21MJGwgDXS7ZQA@public.gmane.org> * diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 37fe9a644f22..c294f6fd43e0 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/gateway_client.h b/net/batman-adv/gateway_client.h index 981f58421a32..f0b86fcb2493 100644 --- a/net/batman-adv/gateway_client.h +++ b/net/batman-adv/gateway_client.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index b3e156af2256..936c107f3199 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/gateway_common.h b/net/batman-adv/gateway_common.h index afebd9c7edf4..80afb2793687 100644 --- a/net/batman-adv/gateway_common.h +++ b/net/batman-adv/gateway_common.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 5f186bff284a..fd4a263dd6b7 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h index de5e9a374ece..d1c0f6189301 100644 --- a/net/batman-adv/hard-interface.h +++ b/net/batman-adv/hard-interface.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/hash.c b/net/batman-adv/hash.c index 04d964358c98..7b49e4001778 100644 --- a/net/batman-adv/hash.c +++ b/net/batman-adv/hash.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2018 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h index 4ce1b6d3ad5c..9490a7ca2ba6 100644 --- a/net/batman-adv/hash.h +++ b/net/batman-adv/hash.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2018 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index e91f29c7c638..7d5e9abb7a65 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h index 84cddd01eeab..958be22beda9 100644 --- a/net/batman-adv/icmp_socket.h +++ b/net/batman-adv/icmp_socket.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c index dc9fa37ddd14..52d8a4b848c0 100644 --- a/net/batman-adv/log.c +++ b/net/batman-adv/log.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2010-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2018 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/log.h b/net/batman-adv/log.h index 35e02b2b9e72..35f4f397ed57 100644 --- a/net/batman-adv/log.h +++ b/net/batman-adv/log.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index d31c8266e244..69c0d85bceb3 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 69bfedfad174..d5d65999207e 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index cbdeb47ec3f6..6eaffe50335a 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2014-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2014-2018 B.A.T.M.A.N. contributors: * * Linus Lüssing * diff --git a/net/batman-adv/multicast.h b/net/batman-adv/multicast.h index 3ac06337ab71..6b8594e23da3 100644 --- a/net/batman-adv/multicast.h +++ b/net/batman-adv/multicast.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2014-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2014-2018 B.A.T.M.A.N. contributors: * * Linus Lüssing * diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index a823d3899bad..129af56b944d 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2016-2018 B.A.T.M.A.N. contributors: * * Matthias Schiffer * diff --git a/net/batman-adv/netlink.h b/net/batman-adv/netlink.h index 0e7e57b69b54..571d9a5ae7aa 100644 --- a/net/batman-adv/netlink.h +++ b/net/batman-adv/netlink.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2016-2018 B.A.T.M.A.N. contributors: * * Matthias Schiffer * diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index b48116bb24ef..c3578444f3cb 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2018 B.A.T.M.A.N. contributors: * * Martin Hundebøll, Jeppe Ledet-Pedersen * diff --git a/net/batman-adv/network-coding.h b/net/batman-adv/network-coding.h index adaeafa4f71e..65c346812bc1 100644 --- a/net/batman-adv/network-coding.h +++ b/net/batman-adv/network-coding.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2018 B.A.T.M.A.N. contributors: * * Martin Hundebøll, Jeppe Ledet-Pedersen * diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 58a7d9274435..2a51a0cbb82a 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index 8e543a3cdc6c..f3601ab0872e 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index b6891e8b741c..289df027ecdd 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h index a1289bc5f115..db54c2d9b8bf 100644 --- a/net/batman-adv/routing.h +++ b/net/batman-adv/routing.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 2a5ab6f1076d..4a35f5c2f52b 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index 1e8c79093623..64cce07b8fe6 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 900c5ce21cd4..c95e2b2677fd 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 075c5b5b2ce1..daf87f07fadd 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index c1578fa0b952..f2eef43bd2ec 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2010-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2018 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/sysfs.h b/net/batman-adv/sysfs.h index bbeee61221fa..c1e3fb69952d 100644 --- a/net/batman-adv/sysfs.h +++ b/net/batman-adv/sysfs.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2010-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2018 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index 8b576712d0c1..11520de96ccb 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2018 B.A.T.M.A.N. contributors: * * Edo Monticelli, Antonio Quartulli * diff --git a/net/batman-adv/tp_meter.h b/net/batman-adv/tp_meter.h index c8b8f2cb2c2b..68e600974759 100644 --- a/net/batman-adv/tp_meter.h +++ b/net/batman-adv/tp_meter.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2012-2018 B.A.T.M.A.N. contributors: * * Edo Monticelli, Antonio Quartulli * diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 7550a9ccd695..0225616d5771 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich, Antonio Quartulli * diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index 8d9e3abec2c8..01b6c8eafaf9 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich, Antonio Quartulli * diff --git a/net/batman-adv/tvlv.c b/net/batman-adv/tvlv.c index 5ffcb45ac6ff..a637458205d1 100644 --- a/net/batman-adv/tvlv.c +++ b/net/batman-adv/tvlv.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/tvlv.h b/net/batman-adv/tvlv.h index a74df33f446d..ef5867f49824 100644 --- a/net/batman-adv/tvlv.h +++ b/net/batman-adv/tvlv.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index bb1578410e0c..4a3b8837e1b5 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * -- 2.11.0 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 3/5] batman-adv: Fix indentation of batadv_seq_before [not found] ` <20180302175745.12551-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> 2018-03-02 17:57 ` [PATCH 1/5] batman-adv: Start new development cycle Simon Wunderlich 2018-03-02 17:57 ` [PATCH 2/5] batman-adv: Update copyright years for 2018 Simon Wunderlich @ 2018-03-02 17:57 ` Simon Wunderlich 2018-03-02 17:57 ` [PATCH 4/5] batman-adv: Avoid relation operator comparison with bool Simon Wunderlich ` (2 subsequent siblings) 5 siblings, 0 replies; 22+ messages in thread From: Simon Wunderlich @ 2018-03-02 17:57 UTC (permalink / raw) To: davem-fT/PcQaiUtIeIZ0/mPfg9Q Cc: netdev-u79uwXL29TY76Z2rM5mHXA, b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r From: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org> Also multiline macros should have their statements start on a tabstop. This was detected by checkpatch.pl after commit a134f8de9f40 ("checkpatch: improve the TABSTOP test to include declarations"). Signed-off-by: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org> Signed-off-by: Simon Wunderlich <sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> --- net/batman-adv/main.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index d5d65999207e..057a28a9fe88 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -331,11 +331,13 @@ static inline bool batadv_has_timed_out(unsigned long timestamp, * * Return: true when x is a predecessor of y, false otherwise */ -#define batadv_seq_before(x, y) ({typeof(x)_d1 = (x); \ - typeof(y)_d2 = (y); \ - typeof(x)_dummy = (_d1 - _d2); \ - (void)(&_d1 == &_d2); \ - _dummy > batadv_smallest_signed_int(_dummy); }) +#define batadv_seq_before(x, y) ({ \ + typeof(x)_d1 = (x); \ + typeof(y)_d2 = (y); \ + typeof(x)_dummy = (_d1 - _d2); \ + (void)(&_d1 == &_d2); \ + _dummy > batadv_smallest_signed_int(_dummy); \ +}) /** * batadv_seq_after() - Checks if a sequence number x is a successor of y -- 2.11.0 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 4/5] batman-adv: Avoid relation operator comparison with bool [not found] ` <20180302175745.12551-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> ` (2 preceding siblings ...) 2018-03-02 17:57 ` [PATCH 3/5] batman-adv: Fix indentation of batadv_seq_before Simon Wunderlich @ 2018-03-02 17:57 ` Simon Wunderlich 2018-03-02 17:57 ` [PATCH 5/5] batman-adv: always assume 2-byte packet alignment Simon Wunderlich 2018-03-04 23:46 ` [PATCH 0/5] pull request for net-next: batman-adv 2018-03-02 David Miller 5 siblings, 0 replies; 22+ messages in thread From: Simon Wunderlich @ 2018-03-02 17:57 UTC (permalink / raw) To: davem-fT/PcQaiUtIeIZ0/mPfg9Q Cc: netdev-u79uwXL29TY76Z2rM5mHXA, b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r From: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org> commit 785ea1144182 ("batman-adv: Distributed ARP Table - create DHT helper functions") introduced a return check of batadv_compare_eth which uses a boolean return value since commit 16af73458aca ("batman-adv: main, batadv_compare_eth return bool"). A relational (<, >, <= or >=) operator is not the right one for such a check. Reported-by: David Binderman <dcb314-PkbjNfxxIARBDgjK7y7TUQ@public.gmane.org> Signed-off-by: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org> Acked-by: Antonio Quartulli <a@unstable.cc> Signed-off-by: Simon Wunderlich <sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> --- 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 19b15de455ab..4469dcc1558f 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -495,7 +495,7 @@ static bool batadv_is_orig_node_eligible(struct batadv_dat_candidate *res, * the one with the lowest address */ if (tmp_max == max && max_orig_node && - batadv_compare_eth(candidate->orig, max_orig_node->orig) > 0) + batadv_compare_eth(candidate->orig, max_orig_node->orig)) goto out; ret = true; -- 2.11.0 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 5/5] batman-adv: always assume 2-byte packet alignment [not found] ` <20180302175745.12551-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> ` (3 preceding siblings ...) 2018-03-02 17:57 ` [PATCH 4/5] batman-adv: Avoid relation operator comparison with bool Simon Wunderlich @ 2018-03-02 17:57 ` Simon Wunderlich 2018-03-04 23:46 ` [PATCH 0/5] pull request for net-next: batman-adv 2018-03-02 David Miller 5 siblings, 0 replies; 22+ messages in thread From: Simon Wunderlich @ 2018-03-02 17:57 UTC (permalink / raw) To: davem-fT/PcQaiUtIeIZ0/mPfg9Q Cc: netdev-u79uwXL29TY76Z2rM5mHXA, b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r From: Matthias Schiffer <mschiffer-Nyw9WiXk/RKXhJHkyCwd5uTW4wlIGRCZ@public.gmane.org> NIC drivers generally try to ensure that the "network header" is aligned to a 4-byte boundary. This is not always possible: When Ethernet frames are encapsulated in other packets with 4-byte aligned headers, the inner Ethernet header will have 4-byte alignment, and in consequence, the inner network header is aligned to 2, but not to 4 bytes. Most parts of batman-adv only care about 2-byte alignment; in particular, no unaligned accesses occur in performance-critical paths that handle actual payload data. This is not true for OGM handling: the seqno and crc fields are accessed as 32-bit values. To avoid these unaligned accesses, this patch reduces the expected packet alignment to 2 bytes for all of batadv's packet types. As no unaligned accesses existed on the performance-critical paths anyways, this chance does have any (positive or negative) effect on performance, but it still makes sense to avoid these accesses to prevent log noise when examining other unaligned accesses in the kernel while batman-adv is active. Signed-off-by: Matthias Schiffer <mschiffer-Nyw9WiXk/RKXhJHkyCwd5uTW4wlIGRCZ@public.gmane.org> Signed-off-by: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org> Signed-off-by: Simon Wunderlich <sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> --- include/uapi/linux/batadv_packet.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/include/uapi/linux/batadv_packet.h b/include/uapi/linux/batadv_packet.h index daefd7283896..894d8d2f713d 100644 --- a/include/uapi/linux/batadv_packet.h +++ b/include/uapi/linux/batadv_packet.h @@ -196,8 +196,6 @@ struct batadv_bla_claim_dst { __be16 group; /* group id */ }; -#pragma pack() - /** * struct batadv_ogm_packet - ogm (routing protocol) packet * @packet_type: batman-adv packet type, part of the general header @@ -222,9 +220,6 @@ struct batadv_ogm_packet { __u8 reserved; __u8 tq; __be16 tvlv_len; - /* __packed is not needed as the struct size is divisible by 4, - * and the largest data type in this struct has a size of 4. - */ }; #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) @@ -249,9 +244,6 @@ struct batadv_ogm2_packet { __u8 orig[ETH_ALEN]; __be16 tvlv_len; __be32 throughput; - /* __packed is not needed as the struct size is divisible by 4, - * and the largest data type in this struct has a size of 4. - */ }; #define BATADV_OGM2_HLEN sizeof(struct batadv_ogm2_packet) @@ -405,7 +397,6 @@ struct batadv_icmp_packet_rr { * misalignment of the payload after the ethernet header. It may also lead to * leakage of information when the padding it not initialized before sending. */ -#pragma pack(2) /** * struct batadv_unicast_packet - unicast packet for network payload @@ -533,8 +524,6 @@ struct batadv_coded_packet { __be16 coded_len; }; -#pragma pack() - /** * struct batadv_unicast_tvlv_packet - generic unicast packet with tvlv payload * @packet_type: batman-adv packet type, part of the general header @@ -641,4 +630,6 @@ struct batadv_tvlv_mcast_data { __u8 reserved[3]; }; +#pragma pack() + #endif /* _UAPI_LINUX_BATADV_PACKET_H_ */ -- 2.11.0 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 0/5] pull request for net-next: batman-adv 2018-03-02 [not found] ` <20180302175745.12551-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> ` (4 preceding siblings ...) 2018-03-02 17:57 ` [PATCH 5/5] batman-adv: always assume 2-byte packet alignment Simon Wunderlich @ 2018-03-04 23:46 ` David Miller 5 siblings, 0 replies; 22+ messages in thread From: David Miller @ 2018-03-04 23:46 UTC (permalink / raw) To: sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX Cc: netdev-u79uwXL29TY76Z2rM5mHXA, b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r From: Simon Wunderlich <sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> Date: Fri, 2 Mar 2018 18:57:40 +0100 > here is a little cleanup pull request of batman-adv to go into net-next. > > Please pull or let me know of any problem! Pulled, thanks Simon. ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 0/5] pull request for net-next: batman-adv 2018-09-19 @ 2018-09-19 12:32 Simon Wunderlich 2018-09-19 12:32 ` [PATCH 1/5] batman-adv: Start new development cycle Simon Wunderlich 0 siblings, 1 reply; 22+ messages in thread From: Simon Wunderlich @ 2018-09-19 12:32 UTC (permalink / raw) To: davem-fT/PcQaiUtIeIZ0/mPfg9Q Cc: netdev-u79uwXL29TY76Z2rM5mHXA, b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r Hi David, here is a little feature and cleanup pull request of batman-adv to go into net-next. Please pull or let me know of any problem! Thank you, Simon The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3: Linux 4.19-rc1 (2018-08-26 14:11:59 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20180919 for you to fetch changes up to a7ea49afcc888dd5aac76774767bfb90be937aad: batman-adv: Enable LockLess TX for softif (2018-09-15 09:51:10 +0200) ---------------------------------------------------------------- This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Inform users about debugfs interface deprecation, by Sven Eckelmann - Implement tracing, planned to replace debugfs log messages, by Sven Eckelmann - Move OGM rebroadcasts to per interface struct, by Sven Eckelmann - Enable LockLess TX to increase throughput, by Sven Eckelmann ---------------------------------------------------------------- Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (4): batman-adv: Mark debugfs functionality as deprecated batman-adv: Provide debug messages as trace events batman-adv: Move OGM rebroadcast stats to orig_ifinfo batman-adv: Enable LockLess TX for softif net/batman-adv/Kconfig | 11 ++ net/batman-adv/Makefile | 3 + net/batman-adv/bat_iv_ogm.c | 330 ++++++++++++---------------------------- net/batman-adv/debugfs.c | 37 +++++ net/batman-adv/debugfs.h | 6 + net/batman-adv/hard-interface.c | 47 +++--- net/batman-adv/icmp_socket.c | 3 + net/batman-adv/log.c | 20 ++- net/batman-adv/main.h | 2 +- net/batman-adv/originator.c | 107 ------------- net/batman-adv/originator.h | 4 - net/batman-adv/soft-interface.c | 2 +- net/batman-adv/trace.c | 22 +++ net/batman-adv/trace.h | 78 ++++++++++ net/batman-adv/types.h | 62 +++----- 15 files changed, 323 insertions(+), 411 deletions(-) create mode 100644 net/batman-adv/trace.c create mode 100644 net/batman-adv/trace.h ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 1/5] batman-adv: Start new development cycle 2018-09-19 12:32 [PATCH 0/5] pull request for net-next: batman-adv 2018-09-19 Simon Wunderlich @ 2018-09-19 12:32 ` Simon Wunderlich 0 siblings, 0 replies; 22+ messages in thread From: Simon Wunderlich @ 2018-09-19 12:32 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> --- 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 8da3c9336111..2002b70e18db 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -25,7 +25,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2018.2" +#define BATADV_SOURCE_VERSION "2018.4" #endif /* B.A.T.M.A.N. parameters */ -- 2.11.0 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 0/5] pull request for net-next: batman-adv 2019-11-05 @ 2019-11-05 9:35 Simon Wunderlich 2019-11-05 9:35 ` [PATCH 1/5] batman-adv: Start new development cycle Simon Wunderlich 0 siblings, 1 reply; 22+ messages in thread From: Simon Wunderlich @ 2019-11-05 9:35 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich Hi David, here is a little cleanup pull request of batman-adv to go into net-next. Please pull or let me know of any problem! Thank you, Simon The following changes since commit 1204c70d9dcba31164f78ad5d8c88c42335d51f8: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2019-11-01 17:48:11 -0700) are available in the Git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20191105 for you to fetch changes up to 5759af0682b3395e64cf615e062d6ecad01428dc: batman-adv: Drop lockdep.h include for soft-interface.c (2019-11-03 08:30:58 +0100) ---------------------------------------------------------------- This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Simplify batadv_v_ogm_aggr_list_free using skb_queue_purge, by Christophe Jaillet - Replace aggr_list_lock with lock free skb handlers, by Christophe Jaillet - explicitly mark fallthrough cases, by Sven Eckelmann - Drop lockdep.h include from soft-interface.c, by Sven Eckelmann ---------------------------------------------------------------- Christophe JAILLET (2): batman-adv: Simplify 'batadv_v_ogm_aggr_list_free()' batman-adv: Axe 'aggr_list_lock' Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (2): batman-adv: Use 'fallthrough' pseudo keyword batman-adv: Drop lockdep.h include for soft-interface.c net/batman-adv/bat_v.c | 1 - net/batman-adv/bat_v_ogm.c | 34 +++++++++++++++------------------- net/batman-adv/main.h | 2 +- net/batman-adv/multicast.c | 2 +- net/batman-adv/soft-interface.c | 5 ++--- net/batman-adv/types.h | 3 --- 6 files changed, 19 insertions(+), 28 deletions(-) ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 1/5] batman-adv: Start new development cycle 2019-11-05 9:35 [PATCH 0/5] pull request for net-next: batman-adv 2019-11-05 Simon Wunderlich @ 2019-11-05 9:35 ` Simon Wunderlich 0 siblings, 0 replies; 22+ messages in thread From: Simon Wunderlich @ 2019-11-05 9:35 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> --- 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 6967f2e4c3f4..c7b340ddd0e7 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2019.4" +#define BATADV_SOURCE_VERSION "2019.5" #endif /* B.A.T.M.A.N. parameters */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 0/5] pull request for net-next: batman-adv 2020-04-27 @ 2020-04-27 15:06 Simon Wunderlich 2020-04-27 15:06 ` [PATCH 1/5] batman-adv: Start new development cycle Simon Wunderlich 0 siblings, 1 reply; 22+ messages in thread From: Simon Wunderlich @ 2020-04-27 15:06 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich Hi David, here is a small cleanup pull request of batman-adv to go into net-next. Please pull or let me know of any problem! Thank you, Simon The following changes since commit 8f3d9f354286745c751374f5f1fcafee6b3f3136: Linux 5.7-rc1 (2020-04-12 12:35:55 -0700) are available in the Git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20200427 for you to fetch changes up to e73f94d1b6f05f6f22434c63de255a9dec6fd23d: batman-adv: remove unused inline function batadv_arp_change_timeout (2020-04-24 15:22:41 +0200) ---------------------------------------------------------------- This cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - fix spelling error, by Sven Eckelmann - drop unneeded types.h include, by Sven Eckelmann - change random number generation to prandom_u32_max(), by Sven Eckelmann - remove unused function batadv_arp_change_timeout(), by Yue Haibing ---------------------------------------------------------------- Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (3): batman-adv: Fix spelling error in term buffer batman-adv: trace: Drop unneeded types.h include batman-adv: Utilize prandom_u32_max for random [0, max) values YueHaibing (1): batman-adv: remove unused inline function batadv_arp_change_timeout net/batman-adv/bat_iv_ogm.c | 4 ++-- net/batman-adv/bat_v_elp.c | 2 +- net/batman-adv/bat_v_ogm.c | 4 ++-- net/batman-adv/distributed-arp-table.h | 5 ----- net/batman-adv/main.h | 2 +- net/batman-adv/trace.h | 1 - net/batman-adv/types.h | 2 +- 7 files changed, 7 insertions(+), 13 deletions(-) ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 1/5] batman-adv: Start new development cycle 2020-04-27 15:06 [PATCH 0/5] pull request for net-next: batman-adv 2020-04-27 Simon Wunderlich @ 2020-04-27 15:06 ` Simon Wunderlich 0 siblings, 0 replies; 22+ messages in thread From: Simon Wunderlich @ 2020-04-27 15:06 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> --- 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 2a234d0ad445..61d8dbe8c954 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2020.1" +#define BATADV_SOURCE_VERSION "2020.2" #endif /* B.A.T.M.A.N. parameters */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 0/5] pull request for net-next: batman-adv 2020-08-24 @ 2020-08-24 16:27 Simon Wunderlich 2020-08-24 16:27 ` [PATCH 1/5] batman-adv: Start new development cycle Simon Wunderlich 0 siblings, 1 reply; 22+ messages in thread From: Simon Wunderlich @ 2020-08-24 16:27 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich Hi David, here is a small cleanup pull request of batman-adv to go into net-next. Please pull or let me know of any problem! Thank you, Simon The following changes since commit 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5: Linux 5.9-rc1 (2020-08-16 13:04:57 -0700) are available in the Git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20200824 for you to fetch changes up to 0093870aa891594d170e1dc9aa192a30d530d755: batman-adv: Migrate to linux/prandom.h (2020-08-18 19:39:54 +0200) ---------------------------------------------------------------- This cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Drop unused function batadv_hardif_remove_interfaces(), by Sven Eckelmann - delete duplicated words, by Randy Dunlap - Drop (even more) repeated words in comments, by Sven Eckelmann - Migrate to linux/prandom.h, by Sven Eckelmann ---------------------------------------------------------------- Randy Dunlap (1): batman-adv: types.h: delete duplicated words Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (3): batman-adv: Drop unused function batadv_hardif_remove_interfaces() batman-adv: Drop repeated words in comments batman-adv: Migrate to linux/prandom.h net/batman-adv/bat_iv_ogm.c | 1 + net/batman-adv/bat_v_elp.c | 1 + net/batman-adv/bat_v_ogm.c | 1 + net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/fragmentation.c | 2 +- net/batman-adv/hard-interface.c | 19 +------------------ net/batman-adv/hard-interface.h | 1 - net/batman-adv/main.c | 1 - net/batman-adv/main.h | 2 +- net/batman-adv/multicast.c | 2 +- net/batman-adv/network-coding.c | 4 ++-- net/batman-adv/send.c | 2 +- net/batman-adv/soft-interface.c | 4 ++-- net/batman-adv/types.h | 4 ++-- 14 files changed, 15 insertions(+), 31 deletions(-) ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 1/5] batman-adv: Start new development cycle 2020-08-24 16:27 [PATCH 0/5] pull request for net-next: batman-adv 2020-08-24 Simon Wunderlich @ 2020-08-24 16:27 ` Simon Wunderlich 0 siblings, 0 replies; 22+ messages in thread From: Simon Wunderlich @ 2020-08-24 16:27 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> --- 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 0393bb9ed3d0..a47dc332d796 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2020.3" +#define BATADV_SOURCE_VERSION "2020.4" #endif /* B.A.T.M.A.N. parameters */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 0/5] pull request for net-next: batman-adv 2023-01-27 @ 2023-01-27 10:21 Simon Wunderlich 2023-01-27 10:21 ` [PATCH 1/5] batman-adv: Start new development cycle Simon Wunderlich 0 siblings, 1 reply; 22+ messages in thread From: Simon Wunderlich @ 2023-01-27 10:21 UTC (permalink / raw) To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich Hi Jakub, hi David, here is a feature/cleanup pull request of batman-adv to go into net-next. Please pull or let me know of any problem! Thank you, Simon The following changes since commit 88603b6dc419445847923fcb7fe5080067a30f98: Linux 6.2-rc2 (2023-01-01 13:53:16 -0800) are available in the Git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20230127 for you to fetch changes up to 0c4061c0d0e2c381ffe4d8b7c62ea69ad8132071: batman-adv: tvlv: prepare for tvlv enabled multicast packet type (2023-01-21 19:01:59 +0100) ---------------------------------------------------------------- This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - drop prandom.h includes, by Sven Eckelmann - fix mailing list address, by Sven Eckelmann - multicast feature preparation, by Linus Lüssing (2 patches) ---------------------------------------------------------------- Linus Lüssing (2): batman-adv: mcast: remove now redundant single ucast forwarding batman-adv: tvlv: prepare for tvlv enabled multicast packet type Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (2): batman-adv: Drop prandom.h includes batman-adv: Fix mailing list address Documentation/networking/batman-adv.rst | 2 +- include/uapi/linux/batadv_packet.h | 2 + net/batman-adv/bat_iv_ogm.c | 1 - net/batman-adv/bat_v_elp.c | 1 - net/batman-adv/bat_v_ogm.c | 5 +- net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/gateway_common.c | 2 +- net/batman-adv/main.h | 2 +- net/batman-adv/multicast.c | 251 ++------------------------------ net/batman-adv/multicast.h | 38 +---- net/batman-adv/network-coding.c | 4 +- net/batman-adv/routing.c | 7 +- net/batman-adv/soft-interface.c | 26 ++-- net/batman-adv/translation-table.c | 4 +- net/batman-adv/tvlv.c | 71 ++++++--- net/batman-adv/tvlv.h | 9 +- net/batman-adv/types.h | 6 + 17 files changed, 110 insertions(+), 323 deletions(-) ^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 1/5] batman-adv: Start new development cycle 2023-01-27 10:21 [PATCH 0/5] pull request for net-next: batman-adv 2023-01-27 Simon Wunderlich @ 2023-01-27 10:21 ` Simon Wunderlich 2023-01-30 7:40 ` patchwork-bot+netdevbpf 2023-01-30 14:55 ` Jiri Pirko 0 siblings, 2 replies; 22+ messages in thread From: Simon Wunderlich @ 2023-01-27 10:21 UTC (permalink / raw) To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich This version will contain all the (major or even only minor) changes for Linux 6.3. The version number isn't a semantic version number with major and minor information. It is just encoding the year of the expected publishing as Linux -rc1 and the number of published versions this year (starting at 0). Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> --- 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 c48803b32bb0..156ed39eded1 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2022.3" +#define BATADV_SOURCE_VERSION "2023.1" #endif /* B.A.T.M.A.N. parameters */ -- 2.30.2 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 1/5] batman-adv: Start new development cycle 2023-01-27 10:21 ` [PATCH 1/5] batman-adv: Start new development cycle Simon Wunderlich @ 2023-01-30 7:40 ` patchwork-bot+netdevbpf 2023-01-30 14:55 ` Jiri Pirko 1 sibling, 0 replies; 22+ messages in thread From: patchwork-bot+netdevbpf @ 2023-01-30 7:40 UTC (permalink / raw) To: Simon Wunderlich; +Cc: kuba, davem, netdev, b.a.t.m.a.n Hello: This series was applied to netdev/net-next.git (master) by Simon Wunderlich <sw@simonwunderlich.de>: On Fri, 27 Jan 2023 11:21:29 +0100 you wrote: > This version will contain all the (major or even only minor) changes for > Linux 6.3. > > The version number isn't a semantic version number with major and minor > information. It is just encoding the year of the expected publishing as > Linux -rc1 and the number of published versions this year (starting at 0). > > [...] Here is the summary with links: - [1/5] batman-adv: Start new development cycle https://git.kernel.org/netdev/net-next/c/55307f51f48e - [2/5] batman-adv: Drop prandom.h includes https://git.kernel.org/netdev/net-next/c/c4b40f80585c - [3/5] batman-adv: Fix mailing list address https://git.kernel.org/netdev/net-next/c/8f6bc4583713 - [4/5] batman-adv: mcast: remove now redundant single ucast forwarding https://git.kernel.org/netdev/net-next/c/e7d6127b89a9 - [5/5] batman-adv: tvlv: prepare for tvlv enabled multicast packet type https://git.kernel.org/netdev/net-next/c/0c4061c0d0e2 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/5] batman-adv: Start new development cycle 2023-01-27 10:21 ` [PATCH 1/5] batman-adv: Start new development cycle Simon Wunderlich 2023-01-30 7:40 ` patchwork-bot+netdevbpf @ 2023-01-30 14:55 ` Jiri Pirko 2023-02-02 18:44 ` Linus Lüssing 1 sibling, 1 reply; 22+ messages in thread From: Jiri Pirko @ 2023-01-30 14:55 UTC (permalink / raw) To: Simon Wunderlich; +Cc: kuba, davem, netdev, b.a.t.m.a.n Fri, Jan 27, 2023 at 11:21:29AM CET, sw@simonwunderlich.de wrote: >This version will contain all the (major or even only minor) changes for >Linux 6.3. > >The version number isn't a semantic version number with major and minor >information. It is just encoding the year of the expected publishing as >Linux -rc1 and the number of published versions this year (starting at 0). I wonder, what is this versioning good for? ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/5] batman-adv: Start new development cycle 2023-01-30 14:55 ` Jiri Pirko @ 2023-02-02 18:44 ` Linus Lüssing 2023-02-03 8:29 ` Jiri Pirko 0 siblings, 1 reply; 22+ messages in thread From: Linus Lüssing @ 2023-02-02 18:44 UTC (permalink / raw) To: Jiri Pirko; +Cc: Simon Wunderlich, kuba, davem, netdev, b.a.t.m.a.n On Mon, Jan 30, 2023 at 03:55:08PM +0100, Jiri Pirko wrote: > Fri, Jan 27, 2023 at 11:21:29AM CET, sw@simonwunderlich.de wrote: > >This version will contain all the (major or even only minor) changes for > >Linux 6.3. > > > >The version number isn't a semantic version number with major and minor > >information. It is just encoding the year of the expected publishing as > >Linux -rc1 and the number of published versions this year (starting at 0). > > I wonder, what is this versioning good for? The best reason in my opinion is that it's useful to convince ordinary people that they should update :-). Usually when debugging reported issues one of the first things we ask users is to provide the output of "batctl -v": ``` $ batctl -v batctl debian-2023.0-1 [batman-adv: 2022.3] ``` If there is a very old year in there I think it's easier to tell and convince people to try again with newer versions and to update. And also as a developer I find it easier to (roughly) memorize when a feature was added by year than by kernel version number. So I know by heart that TVLVs were added in 2014 and multicast snooping patches and new multicast handling was added around 2019 for instance. But don't ask me which kernel version that was :D. I'd have to look that up. So if "batctl -v" displayed a kernel version number that would be less helpful for me. Also makes it easier for ordinary users to look up and compare their version with our news archive: https://www.open-mesh.org/projects/open-mesh/wiki/News-archive Also note that we can't do a simple kernel version to year notation mapping in userspace in batctl. OpenWrt uses the most recent Linux LTS release. But might feature a backport of a more recent batman-adv which is newer than the one this stable kernel would provide. Or people also often use Debian stable but compile and use the latest batman-adv version with it. Does that make sense? ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/5] batman-adv: Start new development cycle 2023-02-02 18:44 ` Linus Lüssing @ 2023-02-03 8:29 ` Jiri Pirko 2023-02-03 9:38 ` Sven Eckelmann 0 siblings, 1 reply; 22+ messages in thread From: Jiri Pirko @ 2023-02-03 8:29 UTC (permalink / raw) To: Linus Lüssing; +Cc: Simon Wunderlich, kuba, davem, netdev, b.a.t.m.a.n Thu, Feb 02, 2023 at 07:44:06PM CET, linus.luessing@c0d3.blue wrote: >On Mon, Jan 30, 2023 at 03:55:08PM +0100, Jiri Pirko wrote: >> Fri, Jan 27, 2023 at 11:21:29AM CET, sw@simonwunderlich.de wrote: >> >This version will contain all the (major or even only minor) changes for >> >Linux 6.3. >> > >> >The version number isn't a semantic version number with major and minor >> >information. It is just encoding the year of the expected publishing as >> >Linux -rc1 and the number of published versions this year (starting at 0). >> >> I wonder, what is this versioning good for? > >The best reason in my opinion is that it's useful to convince >ordinary people that they should update :-). > >Usually when debugging reported issues one of the first things we ask >users is to provide the output of "batctl -v": > >``` >$ batctl -v >batctl debian-2023.0-1 [batman-adv: 2022.3] Why kernel version is not enough for you? My point is, why to maintain internal driver version alongside with the kernel version? I just don't see any point of having these parallel driver versions. Looks like a historical relict. IDK. I'w just wondering, that's all. >``` > >If there is a very old year in there I think it's easier to tell >and convince people to try again with newer versions and to >update. > >And also as a developer I find it easier to (roughly) memorize >when a feature was added by year than by kernel version number. >So I know by heart that TVLVs were added in 2014 and multicast >snooping patches and new multicast handling was added around 2019 >for instance. But don't ask me which kernel version that was :D. >I'd have to look that up. So if "batctl -v" displayed a kernel >version number that would be less helpful for me. > >Also makes it easier for ordinary users to look up and >compare their version with our news archive: >https://www.open-mesh.org/projects/open-mesh/wiki/News-archive > >Also note that we can't do a simple kernel version to year >notation mapping in userspace in batctl. OpenWrt uses the most >recent Linux LTS release. But might feature a backport of a more >recent batman-adv which is newer than the one this stable kernel >would provide. Or people also often use Debian stable but compile >and use the latest batman-adv version with it. Yeah, for out of tree driver, have whatever. > >Does that make sense? ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/5] batman-adv: Start new development cycle 2023-02-03 8:29 ` Jiri Pirko @ 2023-02-03 9:38 ` Sven Eckelmann 2023-02-07 9:02 ` Leon Romanovsky 0 siblings, 1 reply; 22+ messages in thread From: Sven Eckelmann @ 2023-02-03 9:38 UTC (permalink / raw) To: b.a.t.m.a.n, Jiri Pirko Cc: Linus Lüssing, kuba, davem, netdev, b.a.t.m.a.n [-- Attachment #1: Type: text/plain, Size: 1775 bytes --] On Friday, 3 February 2023 09:29:50 CET Jiri Pirko wrote: [...] > Why kernel version is not enough for you? My point is, why to maintain > internal driver version alongside with the kernel version? [...] > >Also note that we can't do a simple kernel version to year > >notation mapping in userspace in batctl. OpenWrt uses the most > >recent Linux LTS release. But might feature a backport of a more > >recent batman-adv which is newer than the one this stable kernel > >would provide. Or people also often use Debian stable but compile > >and use the latest batman-adv version with it. > > Yeah, for out of tree driver, have whatever. A while back, my personal opinion changed after there were various Linux developers/maintainers were trying to either remove it or wondering about this bump. The idea which I've proposed was to: * still ship the "backports" like out-of-tree tarball with a module version - but directly in its "compat" code * continue to use in projects (which for whatever reason cannot use the in- kernel implementation) a version which represents their upstream backports tarball + their (patch) revision: Something like "2022.0-openwrt-7" * for the in-kernel module, just return either - remove the version information completely from the kernel module MODULE_VERSION + drop BATADV_ATTR_VERSION + modifying batctl to fetch that from uname(). But of course, that would break old batctl versions [1] - or by setting BATADV_SOURCE_VERSION to UTS_RELEASE (+suffix?) or UTS_VERSION But this wasn't well received when mentioning it to Simon+Linus (but I could misremember the persons involved here). Kind regards, Sven [1] https://lore.kernel.org/r/20201205085604.1e3fcaee@kicinski-fedora-pc1c0hjn.DHCP.thefacebook.com [-- Attachment #2: This is a digitally signed message part. --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/5] batman-adv: Start new development cycle 2023-02-03 9:38 ` Sven Eckelmann @ 2023-02-07 9:02 ` Leon Romanovsky 2023-02-07 9:50 ` Sven Eckelmann 0 siblings, 1 reply; 22+ messages in thread From: Leon Romanovsky @ 2023-02-07 9:02 UTC (permalink / raw) To: Sven Eckelmann Cc: b.a.t.m.a.n, Jiri Pirko, Linus Lüssing, kuba, davem, netdev On Fri, Feb 03, 2023 at 10:38:07AM +0100, Sven Eckelmann wrote: > On Friday, 3 February 2023 09:29:50 CET Jiri Pirko wrote: > [...] > > Why kernel version is not enough for you? My point is, why to maintain > > internal driver version alongside with the kernel version? > [...] > > >Also note that we can't do a simple kernel version to year > > >notation mapping in userspace in batctl. OpenWrt uses the most > > >recent Linux LTS release. But might feature a backport of a more > > >recent batman-adv which is newer than the one this stable kernel > > >would provide. Or people also often use Debian stable but compile > > >and use the latest batman-adv version with it. > > > > Yeah, for out of tree driver, have whatever. > > A while back, my personal opinion changed after there were various Linux > developers/maintainers were trying to either remove it or wondering about this > bump. The idea which I've proposed was to: > > * still ship the "backports" like out-of-tree tarball with a module version - > but directly in its "compat" code > * continue to use in projects (which for whatever reason cannot use the in- > kernel implementation) a version which represents their upstream backports > tarball + their (patch) revision: Something like "2022.0-openwrt-7" > * for the in-kernel module, just return either > > - remove the version information completely from the kernel module > MODULE_VERSION + drop BATADV_ATTR_VERSION + modifying batctl to fetch that > from uname(). But of course, that would break old batctl versions [1] > - or by setting BATADV_SOURCE_VERSION to UTS_RELEASE (+suffix?) or > UTS_VERSION > > > But this wasn't well received when mentioning it to Simon+Linus (but I could > misremember the persons involved here). In cases where you can prove real userspace breakage, we simply stop to update module versions. Thanks > > Kind regards, > Sven > > [1] https://lore.kernel.org/r/20201205085604.1e3fcaee@kicinski-fedora-pc1c0hjn.DHCP.thefacebook.com ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/5] batman-adv: Start new development cycle 2023-02-07 9:02 ` Leon Romanovsky @ 2023-02-07 9:50 ` Sven Eckelmann 2023-02-07 10:41 ` Leon Romanovsky 0 siblings, 1 reply; 22+ messages in thread From: Sven Eckelmann @ 2023-02-07 9:50 UTC (permalink / raw) To: Leon Romanovsky Cc: b.a.t.m.a.n, Jiri Pirko, Linus Lüssing, kuba, davem, netdev [-- Attachment #1: Type: text/plain, Size: 1678 bytes --] On Tuesday, 7 February 2023 10:02:58 CET Leon Romanovsky wrote: > In cases where you can prove real userspace breakage, we simply stop to > update module versions. That would be the worst option. Then the kernel shows bogus values and no one is helped. And how should I prove it to you? Is that enough? $ lsmod|grep '^batman_adv' batman_adv 266240 0 $ sudo batctl -v batctl debian-2022.3-2 [batman-adv: module not loaded] $ sudo batctl if add enp70s0 Error - batman-adv module has not been loaded $ sudo ip link show dev bat0 8: bat0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000 link/ether 7a:8b:21:b7:13:b8 brd ff:ff:ff:ff:ff:ff $ sudo ip link set master bat0 dev enp70s0 $ sudo ip link set up dev bat0 $ sudo batctl n Missing attributes from kernel $ sudo batctl o Missing attributes from kernel Expected was following output: $ sudo batctl -v batctl debian-2022.3-2 [batman-adv: 2022.3] $ sudo batctl if add enp70s0 $ sudo ip link show dev bat0 $ sudo ip link set up dev bat0 $ sudo batctl n [B.A.T.M.A.N. adv 2022.3, MainIF/MAC: enp70s0/2c:f0:5d:04:70:39 (bat0/7a:8b:21:b7:13:b8 BATMAN_IV)] IF Neighbor last-seen enp70s0 50:7b:9d:ce:26:83 0.708s $ sudo batctl o [B.A.T.M.A.N. adv 2022.3, MainIF/MAC: enp70s0/2c:f0:5d:04:70:39 (bat0/7a:8b:21:b7:13:b8 BATMAN_IV)] Originator last-seen (#/255) Nexthop [outgoingIF] * 50:7b:9d:ce:26:83 0.684s (255) 50:7b:9d:ce:26:83 [ enp70s0] Kind regards, Sven [-- Attachment #2: This is a digitally signed message part. --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/5] batman-adv: Start new development cycle 2023-02-07 9:50 ` Sven Eckelmann @ 2023-02-07 10:41 ` Leon Romanovsky 2023-02-07 10:57 ` Sven Eckelmann 0 siblings, 1 reply; 22+ messages in thread From: Leon Romanovsky @ 2023-02-07 10:41 UTC (permalink / raw) To: Sven Eckelmann Cc: b.a.t.m.a.n, Jiri Pirko, Linus Lüssing, kuba, davem, netdev On Tue, Feb 07, 2023 at 10:50:08AM +0100, Sven Eckelmann wrote: > On Tuesday, 7 February 2023 10:02:58 CET Leon Romanovsky wrote: > > In cases where you can prove real userspace breakage, we simply stop to > > update module versions. > > That would be the worst option. Then the kernel shows bogus values and no one > is helped. The thing is that you already show bogus values. Most users don't compile their kernel, but use distro-based one. The latter is a mix of base kernel, fixes and sometimes backports. For example, on my system: ➜ kernel git:(wip/leon-for-next) modinfo batman_adv filename: /lib/modules/6.1.9-200.fc37.x86_64/kernel/net/batman-adv/batman-adv.ko.xz .... version: 2022.3 description: B.A.T.M.A.N. advanced ... name: batman_adv vermagic: 6.1.9-200.fc37.x86_64 SMP preempt mod_unload As you can see both of us have 2022.3 in version string, but are we running same code? The answer is no as you run debian and I'm running latest Fedora with different kernel version, which means different batman_adv feature set. Once you stop to update version, you will push users to look on the real version (kernel) which really matters. Thanks > > > And how should I prove it to you? Is that enough? > > $ lsmod|grep '^batman_adv' > batman_adv 266240 0 > $ sudo batctl -v > batctl debian-2022.3-2 [batman-adv: module not loaded] > $ sudo batctl if add enp70s0 > Error - batman-adv module has not been loaded > $ sudo ip link show dev bat0 > 8: bat0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000 > link/ether 7a:8b:21:b7:13:b8 brd ff:ff:ff:ff:ff:ff > $ sudo ip link set master bat0 dev enp70s0 > $ sudo ip link set up dev bat0 > $ sudo batctl n > Missing attributes from kernel > $ sudo batctl o > Missing attributes from kernel > > > Expected was following output: > > $ sudo batctl -v > batctl debian-2022.3-2 [batman-adv: 2022.3] > $ sudo batctl if add enp70s0 > $ sudo ip link show dev bat0 > $ sudo ip link set up dev bat0 > $ sudo batctl n > [B.A.T.M.A.N. adv 2022.3, MainIF/MAC: enp70s0/2c:f0:5d:04:70:39 (bat0/7a:8b:21:b7:13:b8 BATMAN_IV)] > IF Neighbor last-seen > enp70s0 50:7b:9d:ce:26:83 0.708s > $ sudo batctl o > [B.A.T.M.A.N. adv 2022.3, MainIF/MAC: enp70s0/2c:f0:5d:04:70:39 (bat0/7a:8b:21:b7:13:b8 BATMAN_IV)] > Originator last-seen (#/255) Nexthop [outgoingIF] > * 50:7b:9d:ce:26:83 0.684s (255) 50:7b:9d:ce:26:83 [ enp70s0] > > Kind regards, > Sven ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/5] batman-adv: Start new development cycle 2023-02-07 10:41 ` Leon Romanovsky @ 2023-02-07 10:57 ` Sven Eckelmann 2023-02-07 11:20 ` Leon Romanovsky 0 siblings, 1 reply; 22+ messages in thread From: Sven Eckelmann @ 2023-02-07 10:57 UTC (permalink / raw) To: Leon Romanovsky Cc: b.a.t.m.a.n, Jiri Pirko, Linus Lüssing, kuba, davem, netdev [-- Attachment #1: Type: text/plain, Size: 645 bytes --] On Tuesday, 7 February 2023 11:41:53 CET Leon Romanovsky wrote: > Once you stop to update version, you will push users to look on the real > version (kernel) which really matters. I would have understood if you say "let us use a magic value like 'in-tree' or 'linux'" but setting it to an old (existing) version number - I don't want to live with the headaches it creates. Because this is what users often don't (want) to understand: if it looks like a valid version number, why isn't it the valid version number? So I have to do a lot of pushing - without any rewards because it is necessary to push every new "user". Kind regards, Sven [-- Attachment #2: This is a digitally signed message part. --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/5] batman-adv: Start new development cycle 2023-02-07 10:57 ` Sven Eckelmann @ 2023-02-07 11:20 ` Leon Romanovsky 0 siblings, 0 replies; 22+ messages in thread From: Leon Romanovsky @ 2023-02-07 11:20 UTC (permalink / raw) To: Sven Eckelmann Cc: b.a.t.m.a.n, Jiri Pirko, Linus Lüssing, kuba, davem, netdev On Tue, Feb 07, 2023 at 11:57:41AM +0100, Sven Eckelmann wrote: > On Tuesday, 7 February 2023 11:41:53 CET Leon Romanovsky wrote: > > Once you stop to update version, you will push users to look on the real > > version (kernel) which really matters. > > I would have understood if you say "let us use a magic value like 'in-tree' or > 'linux'" but setting it to an old (existing) version number - I don't want to > live with the headaches it creates. Because this is what users often don't > (want) to understand: if it looks like a valid version number, why isn't it > the valid version number? So I have to do a lot of pushing - without any > rewards because it is necessary to push every new "user". I'm not sharing your view about users and think they need to be educated, even it is hard and non-rewarding job. Thanks > > Kind regards, > Sven ^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2023-02-07 11:20 UTC | newest] Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-03-02 17:57 [PATCH 0/5] pull request for net-next: batman-adv 2018-03-02 Simon Wunderlich [not found] ` <20180302175745.12551-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> 2018-03-02 17:57 ` [PATCH 1/5] batman-adv: Start new development cycle Simon Wunderlich 2018-03-02 17:57 ` [PATCH 2/5] batman-adv: Update copyright years for 2018 Simon Wunderlich 2018-03-02 17:57 ` [PATCH 3/5] batman-adv: Fix indentation of batadv_seq_before Simon Wunderlich 2018-03-02 17:57 ` [PATCH 4/5] batman-adv: Avoid relation operator comparison with bool Simon Wunderlich 2018-03-02 17:57 ` [PATCH 5/5] batman-adv: always assume 2-byte packet alignment Simon Wunderlich 2018-03-04 23:46 ` [PATCH 0/5] pull request for net-next: batman-adv 2018-03-02 David Miller 2018-09-19 12:32 [PATCH 0/5] pull request for net-next: batman-adv 2018-09-19 Simon Wunderlich 2018-09-19 12:32 ` [PATCH 1/5] batman-adv: Start new development cycle Simon Wunderlich 2019-11-05 9:35 [PATCH 0/5] pull request for net-next: batman-adv 2019-11-05 Simon Wunderlich 2019-11-05 9:35 ` [PATCH 1/5] batman-adv: Start new development cycle Simon Wunderlich 2020-04-27 15:06 [PATCH 0/5] pull request for net-next: batman-adv 2020-04-27 Simon Wunderlich 2020-04-27 15:06 ` [PATCH 1/5] batman-adv: Start new development cycle Simon Wunderlich 2020-08-24 16:27 [PATCH 0/5] pull request for net-next: batman-adv 2020-08-24 Simon Wunderlich 2020-08-24 16:27 ` [PATCH 1/5] batman-adv: Start new development cycle Simon Wunderlich 2023-01-27 10:21 [PATCH 0/5] pull request for net-next: batman-adv 2023-01-27 Simon Wunderlich 2023-01-27 10:21 ` [PATCH 1/5] batman-adv: Start new development cycle Simon Wunderlich 2023-01-30 7:40 ` patchwork-bot+netdevbpf 2023-01-30 14:55 ` Jiri Pirko 2023-02-02 18:44 ` Linus Lüssing 2023-02-03 8:29 ` Jiri Pirko 2023-02-03 9:38 ` Sven Eckelmann 2023-02-07 9:02 ` Leon Romanovsky 2023-02-07 9:50 ` Sven Eckelmann 2023-02-07 10:41 ` Leon Romanovsky 2023-02-07 10:57 ` Sven Eckelmann 2023-02-07 11:20 ` Leon Romanovsky
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).