[linux-merge]linux integration; annotated tag, v5.11-rc6, created. v5.11-rc6
by postmaster@open-mesh.org
The annotated tag, v5.11-rc6 has been created
at 45e6659327a54b98d7715964f2993e44dfb2c318 (tag)
tagging 1048ba83fb1c00cd24172e23e8263972f6b5d9ac (commit)
replaces v5.11-rc5
tagged by Linus Torvalds
on Sun Jan 31 13:50:09 2021 -0800
- Shortlog ------------------------------------------------------------
Linux 5.11-rc6
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmAXJhEeHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGXF0H/jwVgN3VudFrc5xb
F1KV/eLz2wp3KHCh8TrdhyItUv9qYZnwroNSFuwQsKyeOHeod192oHda9UCIoCAo
k8aFG4iILwXfVnhNUXeLjJD7WfP7AaJZpPqn6pvzJH9ONN1GsLO41iYO/v/MKcmS
OLPivR1/Yv3ON0SktEXK57kxGGKEcgSRRBmlouo16qhb1ME8flUphx9eLZ7uchAm
bQ2Ui/F6TmsUD1BaPl8scC/FWbbeu5fZtAkL/VxuGGJh5Uisb/yTQluG4+mCGw4y
zTPsHI3D59QP3YePO5cbq8h1F4V88rCt/EHn4/RmRpRgvgHT8XbvG223/CVw9h3R
26E6z2k=
=3w5Q
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
2 years
[batman-adv] master: batman-adv: remove redundant 'depends on NET' (969cb132)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit 969cb13262076840d54c6e30760227faaf0aa7f7
Author: Masahiro Yamada <masahiroy(a)kernel.org>
Date: Tue Jan 26 08:20:26 2021 +0900
batman-adv: remove redundant 'depends on NET'
These Kconfig file is included from net/Kconfig, inside the
if NET ... endif.
Remove 'depends on NET', which we know it is already met.
Signed-off-by: Masahiro Yamada <masahiroy(a)kernel.org>
Link: https://lore.kernel.org/r/20210125232026.106855-1-masahiroy@kernel.org
Signed-off-by: Jakub Kicinski <kuba(a)kernel.org>
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
969cb13262076840d54c6e30760227faaf0aa7f7
net/batman-adv/Kconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig
index 497ad1cf..09cc8360 100644
--- a/net/batman-adv/Kconfig
+++ b/net/batman-adv/Kconfig
@@ -9,7 +9,6 @@
config BATMAN_ADV
tristate "B.A.T.M.A.N. Advanced Meshing Protocol"
- depends on NET
select LIBCRC32C
help
B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is
2 years
[alfred] master: alfred: Update CHANGELOG for upcoming release (6c43ec8)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/alfred
On branch : master
>---------------------------------------------------------------
commit 6c43ec8c632302af2191f9400125fc245a42eac8
Author: Simon Wunderlich <sw(a)simonwunderlich.de>
Date: Thu Jan 28 17:31:13 2021 +0100
alfred: Update CHANGELOG for upcoming release
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
6c43ec8c632302af2191f9400125fc245a42eac8
CHANGELOG.rst | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index eb98fa8..52817c9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,5 +1,10 @@
.. SPDX-License-Identifier: GPL-2.0
+2021.0 (2021-01-28)
+===================
+
+* Drop support for batman-adv's sysfs+debugfs
+
2020.4 (2020-10-27)
===================
2 years
[batctl] maint's head updated: batctl: Update CHANGELOG for upcoming release (5dd8474)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batctl
Branch 'maint' now includes:
c466db6 batctl: Start new development cycle
d985e88 batctl: Move next release to 2021
0e04a59 Merge branch 'maint' into master
07bacdf batctl: Allow to configure routing_algo during interface creation
e0ccb9b batctl: Switch active routing algo list to netlink
46ef705 batctl: Drop deprecated debugfs support
aa0e498 batctl: Drop deprecated sysfs support
a0da92b Merge branch 'maint'
5dd8474 batctl: Update CHANGELOG for upcoming release
2 years
[batman-adv] master: batman-adv: Update compatible kernel version number (fbb853ec)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit fbb853ec870380fe76283d9fbe8ba106739fa260
Author: Simon Wunderlich <sw(a)simonwunderlich.de>
Date: Thu Jan 28 17:27:45 2021 +0100
batman-adv: Update compatible kernel version number
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
fbb853ec870380fe76283d9fbe8ba106739fa260
README.external.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.external.rst b/README.external.rst
index b510507a..13a892ad 100644
--- a/README.external.rst
+++ b/README.external.rst
@@ -12,7 +12,7 @@ and as an external module. The external module allows to get
new features without upgrading to a newer kernel version
and to get batman-adv specific bug fixes for kernels that are
not supported anymore. It compiles against and should work
-with Linux 4.4 - 5.10. Supporting older versions is not
+with Linux 4.4 - 5.11. Supporting older versions is not
planned, but it's probably easy to backport it. If you work on a
backport, feel free to contact us. :-)
2 years
[batman-adv] master: batman-adv: Start new development cycle (105b247f)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit 105b247f3cca4688e6b99d37e7b565ea383a9164
Author: Simon Wunderlich <sw(a)simonwunderlich.de>
Date: Thu Jan 28 17:27:56 2021 +0100
batman-adv: Start new development cycle
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
105b247f3cca4688e6b99d37e7b565ea383a9164
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 28820163..2486efe4 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 "2021.0"
+#define BATADV_SOURCE_VERSION "2021.1"
#endif
/* B.A.T.M.A.N. parameters */
2 years
[batman-adv] tag 'v2021.0' created
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batman-adv
New tag : v2021.0
Referencing: f2d83bd7eeab64d3dd8fe6768f0096a790ba6dac
2 years
[batctl] master: batctl: Update CHANGELOG for upcoming release (5dd8474)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batctl
On branch : master
>---------------------------------------------------------------
commit 5dd8474c29880c6de44d3e185fd605fc27e4c8a3
Author: Simon Wunderlich <sw(a)simonwunderlich.de>
Date: Thu Jan 28 17:29:40 2021 +0100
batctl: Update CHANGELOG for upcoming release
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
5dd8474c29880c6de44d3e185fd605fc27e4c8a3
CHANGELOG.rst | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e704feb..8a22839 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,5 +1,15 @@
.. SPDX-License-Identifier: GPL-2.0
+2021.0 (2021-01-28)
+===================
+
+* Drop support for batman-adv's sysfs+debugfs
+* allow to select routing algorithm during creation of interface
+* bugs squashed:
+
+ - fix query of meshif's ap_isolation status
+ - ignore "interface already exists" error during "interface add"
+
2020.4 (2020-10-27)
===================
2 years
[batctl] master: batctl: Update copyright years for 2021 (8eff270)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batctl
On branch : master
>---------------------------------------------------------------
commit 8eff270c4bef913d1e4bea7114d737dba174aea8
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Fri Jan 1 00:01:01 2021 +0100
batctl: Update copyright years for 2021
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
8eff270c4bef913d1e4bea7114d737dba174aea8
Makefile | 2 +-
aggregation.c | 2 +-
allocate.h | 2 +-
ap_isolation.c | 2 +-
backbonetable.c | 2 +-
bat-hosts.c | 2 +-
bat-hosts.h | 2 +-
batadv_packet.h | 2 +-
batman_adv.h | 2 +-
bisect_iv.c | 2 +-
bisect_iv.h | 2 +-
bonding.c | 2 +-
bridge_loop_avoidance.c | 2 +-
claimtable.c | 2 +-
dat_cache.c | 2 +-
debug.c | 2 +-
debug.h | 2 +-
distributed_arp_table.c | 2 +-
elp_interval.c | 2 +-
event.c | 2 +-
fragmentation.c | 2 +-
functions.c | 2 +-
functions.h | 2 +-
gateways.c | 2 +-
genl.h | 2 +-
gw_mode.c | 2 +-
hash.c | 2 +-
hash.h | 2 +-
hop_penalty.c | 2 +-
icmp_helper.c | 2 +-
icmp_helper.h | 2 +-
interface.c | 2 +-
isolation_mark.c | 2 +-
list.h | 2 +-
loglevel.c | 2 +-
main.c | 2 +-
main.h | 2 +-
mcast_flags.c | 2 +-
multicast_fanout.c | 2 +-
multicast_forceflood.c | 2 +-
multicast_mode.c | 2 +-
neighbors.c | 2 +-
netlink.c | 2 +-
netlink.h | 2 +-
network_coding.c | 2 +-
orig_interval.c | 2 +-
originators.c | 2 +-
ping.c | 2 +-
routing_algo.c | 2 +-
statistics.c | 2 +-
sys.c | 2 +-
sys.h | 2 +-
tcpdump.c | 2 +-
tcpdump.h | 2 +-
throughput_override.c | 2 +-
throughputmeter.c | 2 +-
traceroute.c | 2 +-
transglobal.c | 2 +-
translate.c | 2 +-
translocal.c | 2 +-
60 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/Makefile b/Makefile
index 71fdf88..68d8dc8 100755
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: GPL-2.0
# -*- makefile -*-
#
-# Copyright (C) 2006-2020 B.A.T.M.A.N. contributors
+# Copyright (C) 2006-2021 B.A.T.M.A.N. contributors
#
# License-Filename: LICENSES/preferred/GPL-2.0
diff --git a/aggregation.c b/aggregation.c
index 5d06471..e09b4c7 100644
--- a/aggregation.c
+++ b/aggregation.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/allocate.h b/allocate.h
index 1164948..bf30c50 100644
--- a/allocate.h
+++ b/allocate.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/ap_isolation.c b/ap_isolation.c
index 2f18015..dcbefe7 100644
--- a/ap_isolation.c
+++ b/ap_isolation.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Antonio Quartulli <a(a)unstable.cc>
*
diff --git a/backbonetable.c b/backbonetable.c
index 84667c4..0f44323 100644
--- a/backbonetable.c
+++ b/backbonetable.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich <sw(a)simonwunderlich.de>
*
diff --git a/bat-hosts.c b/bat-hosts.c
index 99d6151..3ac4288 100644
--- a/bat-hosts.c
+++ b/bat-hosts.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2021 B.A.T.M.A.N. contributors:
*
* Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/bat-hosts.h b/bat-hosts.h
index 8c0c43b..415cd3f 100644
--- a/bat-hosts.h
+++ b/bat-hosts.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/batadv_packet.h b/batadv_packet.h
index 9c8604c..67b773e 100644
--- a/batadv_packet.h
+++ b/batadv_packet.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */
-/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
*/
diff --git a/batman_adv.h b/batman_adv.h
index bdb317f..27d35e7 100644
--- a/batman_adv.h
+++ b/batman_adv.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: MIT */
-/* Copyright (C) 2016-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2016-2021 B.A.T.M.A.N. contributors:
*
* Matthias Schiffer
*/
diff --git a/bisect_iv.c b/bisect_iv.c
index 1932150..cecdfd5 100644
--- a/bisect_iv.c
+++ b/bisect_iv.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/bisect_iv.h b/bisect_iv.h
index 1a1a9ce..11cac66 100644
--- a/bisect_iv.h
+++ b/bisect_iv.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/bonding.c b/bonding.c
index ee4d314..d597f57 100644
--- a/bonding.c
+++ b/bonding.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c
index 3525a3e..5fea1c1 100644
--- a/bridge_loop_avoidance.c
+++ b/bridge_loop_avoidance.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich <sw(a)simonwunderlich.de>
*
diff --git a/claimtable.c b/claimtable.c
index c41d9c3..d1df97e 100644
--- a/claimtable.c
+++ b/claimtable.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Linus L��ssing <linus.luessing(a)c0d3.blue>
*
diff --git a/dat_cache.c b/dat_cache.c
index 1549c3d..2c959ff 100644
--- a/dat_cache.c
+++ b/dat_cache.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/debug.c b/debug.c
index 55520cb..5619eb0 100644
--- a/debug.c
+++ b/debug.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/debug.h b/debug.h
index f849d19..c6b4714 100644
--- a/debug.h
+++ b/debug.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/distributed_arp_table.c b/distributed_arp_table.c
index 1bccba1..f90955a 100644
--- a/distributed_arp_table.c
+++ b/distributed_arp_table.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Antonio Quartulli <a(a)unstable.cc>
*
diff --git a/elp_interval.c b/elp_interval.c
index f4312e7..a234c75 100644
--- a/elp_interval.c
+++ b/elp_interval.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/event.c b/event.c
index 3fbc6cc..a902943 100644
--- a/event.c
+++ b/event.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Sven Eckelmann <sven(a)narfation.org>
*
diff --git a/fragmentation.c b/fragmentation.c
index 65e4356..92624e6 100644
--- a/fragmentation.c
+++ b/fragmentation.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/functions.c b/functions.c
index 4df1815..7378569 100644
--- a/functions.c
+++ b/functions.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2021 B.A.T.M.A.N. contributors:
*
* Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/functions.h b/functions.h
index 923e593..65f9bd6 100644
--- a/functions.h
+++ b/functions.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2021 B.A.T.M.A.N. contributors:
*
* Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/gateways.c b/gateways.c
index 31979a2..506fa67 100644
--- a/gateways.c
+++ b/gateways.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Linus L��ssing <linus.luessing(a)c0d3.blue>
*
diff --git a/genl.h b/genl.h
index 7c2486b..47ed233 100644
--- a/genl.h
+++ b/genl.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/gw_mode.c b/gw_mode.c
index e48b78d..e555e50 100644
--- a/gw_mode.c
+++ b/gw_mode.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/hash.c b/hash.c
index cbbeda1..f536327 100644
--- a/hash.c
+++ b/hash.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2006-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2006-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Marek Lindner
*
diff --git a/hash.h b/hash.h
index 48c3adb..bda40ac 100644
--- a/hash.h
+++ b/hash.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2006-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2006-2021 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Marek Lindner
*
diff --git a/hop_penalty.c b/hop_penalty.c
index 7430381..c142ff2 100644
--- a/hop_penalty.c
+++ b/hop_penalty.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/icmp_helper.c b/icmp_helper.c
index a167e2a..1de5625 100644
--- a/icmp_helper.c
+++ b/icmp_helper.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>, Simon Wunderlich
*
diff --git a/icmp_helper.h b/icmp_helper.h
index 897a3a8..17b478d 100644
--- a/icmp_helper.h
+++ b/icmp_helper.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2021 B.A.T.M.A.N. contributors:
*
* Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/interface.c b/interface.c
index 7f77459..1050d58 100644
--- a/interface.c
+++ b/interface.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/isolation_mark.c b/isolation_mark.c
index b0048f3..f8cd1a7 100644
--- a/isolation_mark.c
+++ b/isolation_mark.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Antonio Quartulli <a(a)unstable.cc>
*
diff --git a/list.h b/list.h
index 20558d3..ab9c0a3 100644
--- a/list.h
+++ b/list.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: MIT */
/* Minimal Linux-like double-linked list helper functions
*
- * Copyright (c) 2012-2020, Sven Eckelmann <sven(a)narfation.org>
+ * Copyright (c) 2012-2021, Sven Eckelmann <sven(a)narfation.org>
*
* License-Filename: LICENSES/preferred/MIT
*/
diff --git a/loglevel.c b/loglevel.c
index af7349d..203eeff 100644
--- a/loglevel.c
+++ b/loglevel.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/main.c b/main.c
index 54be6fb..77bbdfb 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2021 B.A.T.M.A.N. contributors:
*
* Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/main.h b/main.h
index ea193c1..9196156 100644
--- a/main.h
+++ b/main.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2021 B.A.T.M.A.N. contributors:
*
* Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/mcast_flags.c b/mcast_flags.c
index 63a2c50..3a1e013 100644
--- a/mcast_flags.c
+++ b/mcast_flags.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/multicast_fanout.c b/multicast_fanout.c
index b43ff10..3e86c9c 100644
--- a/multicast_fanout.c
+++ b/multicast_fanout.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Linus L��ssing <linus.luessing(a)c0d3.blue>
*
diff --git a/multicast_forceflood.c b/multicast_forceflood.c
index e02ab9d..f47e780 100644
--- a/multicast_forceflood.c
+++ b/multicast_forceflood.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Linus L��ssing <linus.luessing(a)c0d3.blue>
*
diff --git a/multicast_mode.c b/multicast_mode.c
index f837998..9fc4a08 100644
--- a/multicast_mode.c
+++ b/multicast_mode.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Linus L��ssing <linus.luessing(a)c0d3.blue>
*
diff --git a/neighbors.c b/neighbors.c
index afc65de..47daee6 100644
--- a/neighbors.c
+++ b/neighbors.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Andrew Lunn <andrew(a)lunn.ch>
*
diff --git a/netlink.c b/netlink.c
index 8a46f36..160dcbf 100644
--- a/netlink.c
+++ b/netlink.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch>
*
diff --git a/netlink.h b/netlink.h
index 34622ad..130478f 100644
--- a/netlink.h
+++ b/netlink.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch>
*
diff --git a/network_coding.c b/network_coding.c
index 9868e54..f053ee5 100644
--- a/network_coding.c
+++ b/network_coding.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Martin Hundeb��ll <martin(a)hundeboll.net>
*
diff --git a/orig_interval.c b/orig_interval.c
index 2cdad1a..7b69e95 100644
--- a/orig_interval.c
+++ b/orig_interval.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/originators.c b/originators.c
index 793743a..e4d8cc3 100644
--- a/originators.c
+++ b/originators.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Andrew Lunn <andrew(a)lunn.ch>
* Sven Eckelmann <sven(a)narfation.org>
diff --git a/ping.c b/ping.c
index 17cdf87..de5f340 100644
--- a/ping.c
+++ b/ping.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2021 B.A.T.M.A.N. contributors:
*
* Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/routing_algo.c b/routing_algo.c
index 27458ff..a870364 100644
--- a/routing_algo.c
+++ b/routing_algo.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/statistics.c b/statistics.c
index e88ab30..0f48870 100644
--- a/statistics.c
+++ b/statistics.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2012-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/sys.c b/sys.c
index cde5002..ae3e5cd 100644
--- a/sys.c
+++ b/sys.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/sys.h b/sys.h
index ac7781f..76953c5 100644
--- a/sys.h
+++ b/sys.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/tcpdump.c b/tcpdump.c
index b9edc20..eacb28a 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2021 B.A.T.M.A.N. contributors:
*
* Andreas Langer <an.langer(a)gmx.de>
*
diff --git a/tcpdump.h b/tcpdump.h
index 9ce8f88..eea92e3 100644
--- a/tcpdump.h
+++ b/tcpdump.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2021 B.A.T.M.A.N. contributors:
*
* Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/throughput_override.c b/throughput_override.c
index f42d9de..446614b 100644
--- a/throughput_override.c
+++ b/throughput_override.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/throughputmeter.c b/throughputmeter.c
index 4a233d5..05aac97 100644
--- a/throughputmeter.c
+++ b/throughputmeter.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2013-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2013-2021 B.A.T.M.A.N. contributors:
*
* Antonio Quartulli <a(a)unstable.cc>
*
diff --git a/traceroute.c b/traceroute.c
index 8a6414b..dbda7a5 100644
--- a/traceroute.c
+++ b/traceroute.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2021 B.A.T.M.A.N. contributors:
*
* Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/transglobal.c b/transglobal.c
index 5aede41..abc3b60 100644
--- a/transglobal.c
+++ b/transglobal.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Andrew Lunn <andrew(a)lunn.ch>
* Sven Eckelmann <sven(a)narfation.org>
diff --git a/translate.c b/translate.c
index b910a97..7df973e 100644
--- a/translate.c
+++ b/translate.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2021 B.A.T.M.A.N. contributors:
*
* Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch>
*
diff --git a/translocal.c b/translocal.c
index 45e884c..31f2f91 100644
--- a/translocal.c
+++ b/translocal.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2009-2020 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021 B.A.T.M.A.N. contributors:
*
* Andrew Lunn <andrew(a)lunn.ch>
* Sven Eckelmann <sven(a)narfation.org>
2 years
[batman-adv] master: batman-adv: Fix names for kernel-doc blocks (d7252022)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit d725202290288a1075476cea066792b3e37fef78
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Wed Jan 20 21:00:14 2021 +0100
batman-adv: Fix names for kernel-doc blocks
kernel-doc can only correctly identify the documented function or struct
when the name in the first kernel-doc line references it. But some of the
kernel-doc blocks referenced a different function/struct then it actually
documented.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
d725202290288a1075476cea066792b3e37fef78
net/batman-adv/distributed-arp-table.c | 2 +-
net/batman-adv/multicast.c | 2 +-
net/batman-adv/netlink.c | 4 ++--
net/batman-adv/tp_meter.c | 2 +-
net/batman-adv/types.h | 3 ++-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index 61a6cfef..fcabd6b1 100644
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -1564,7 +1564,7 @@ static int batadv_dat_get_dhcp_message_type(struct sk_buff *skb)
}
/**
- * batadv_dat_get_dhcp_yiaddr() - get yiaddr from a DHCP packet
+ * batadv_dat_dhcp_get_yiaddr() - get yiaddr from a DHCP packet
* @skb: the DHCP packet to parse
* @buf: a buffer to store the yiaddr in
*
diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
index 8db5d285..ad216c42 100644
--- a/net/batman-adv/multicast.c
+++ b/net/batman-adv/multicast.c
@@ -828,7 +828,7 @@ batadv_mcast_bridge_log(struct batadv_priv *bat_priv,
}
/**
- * batadv_mcast_flags_logs() - output debug information about mcast flag changes
+ * batadv_mcast_flags_log() - output debug information about mcast flag changes
* @bat_priv: the bat priv with all the soft interface information
* @flags: TVLV flags indicating the new multicast state
*
diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
index 8eef71a6..c80527b8 100644
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -193,7 +193,7 @@ static int batadv_netlink_mesh_fill_ap_isolation(struct sk_buff *msg,
}
/**
- * batadv_option_set_ap_isolation() - Set ap_isolation from genl msg
+ * batadv_netlink_set_mesh_ap_isolation() - Set ap_isolation from genl msg
* @attr: parsed BATADV_ATTR_AP_ISOLATION_ENABLED attribute
* @bat_priv: the bat priv with all the soft interface information
*
@@ -757,7 +757,7 @@ batadv_netlink_tp_meter_start(struct sk_buff *skb, struct genl_info *info)
}
/**
- * batadv_netlink_tp_meter_start() - Cancel a running tp_meter session
+ * batadv_netlink_tp_meter_cancel() - Cancel a running tp_meter session
* @skb: received netlink message
* @info: receiver information
*
diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
index e61925f1..72ec4aab 100644
--- a/net/batman-adv/tp_meter.c
+++ b/net/batman-adv/tp_meter.c
@@ -131,7 +131,7 @@ static u32 batadv_tp_cwnd(u32 base, u32 increment, u32 min)
}
/**
- * batadv_tp_updated_cwnd() - update the Congestion Windows
+ * batadv_tp_update_cwnd() - update the Congestion Windows
* @tp_vars: the private data of the current TP meter session
* @mss: maximum segment size of transmission
*
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index 65985e26..aae7366b 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -228,7 +228,8 @@ struct batadv_hard_iface {
};
/**
- * struct batadv_orig_ifinfo - B.A.T.M.A.N. IV private orig_ifinfo members
+ * struct batadv_orig_ifinfo_bat_iv - B.A.T.M.A.N. IV private orig_ifinfo
+ * members
*/
struct batadv_orig_ifinfo_bat_iv {
/**
2 years