b.a.t.m.a.n.lists.open-mesh.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/4] pull request for net-next: batman-adv 2021-02-02
@ 2021-02-02 17:40 Simon Wunderlich
  2021-02-02 17:40 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
                   ` (3 more replies)
  0 siblings, 4 replies; 16+ messages in thread
From: Simon Wunderlich @ 2021-02-02 17:40 UTC (permalink / raw)
  To: kuba, davem; +Cc: netdev, b.a.t.m.a.n

Hi Jakub, 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 5c8fe583cce542aa0b84adc939ce85293de36e5e:

  Linux 5.11-rc1 (2020-12-27 15:30:22 -0800)

are available in the Git repository at:

  git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20210202

for you to fetch changes up to 5234e44068060ae45330a5ab972ff86c733ada2f:

  batman-adv: Fix names for kernel-doc blocks (2021-01-28 17:46:29 +0100)

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

 - Bump version strings, by Simon Wunderlich

 - Update copyright years for 2021, by Sven Eckelmann

 - Avoid sizeof on flexible structure, by Sven Eckelmann

 - Fix names for kernel-doc blocks, by Sven Eckelmann

----------------------------------------------------------------
Simon Wunderlich (1):
      batman-adv: Start new development cycle

Sven Eckelmann (3):
      batman-adv: Update copyright years for 2021
      batman-adv: Avoid sizeof on flexible structure
      batman-adv: Fix names for kernel-doc blocks

 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/distributed-arp-table.c | 6 +++---
 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/log.c                   | 2 +-
 net/batman-adv/log.h                   | 2 +-
 net/batman-adv/main.c                  | 2 +-
 net/batman-adv/main.h                  | 4 ++--
 net/batman-adv/multicast.c             | 4 ++--
 net/batman-adv/multicast.h             | 2 +-
 net/batman-adv/netlink.c               | 6 +++---
 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/tp_meter.c              | 4 ++--
 net/batman-adv/tp_meter.h              | 2 +-
 net/batman-adv/trace.c                 | 2 +-
 net/batman-adv/trace.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                 | 5 +++--
 57 files changed, 66 insertions(+), 65 deletions(-)

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 1/4] batman-adv: Start new development cycle
  2021-02-02 17:40 [PATCH 0/4] pull request for net-next: batman-adv 2021-02-02 Simon Wunderlich
@ 2021-02-02 17:40 ` Simon Wunderlich
  2021-02-04  0:33   ` Jakub Kicinski
  2021-02-02 17:40 ` [PATCH 2/4] batman-adv: Update copyright years for 2021 Simon Wunderlich
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 16+ messages in thread
From: Simon Wunderlich @ 2021-02-02 17:40 UTC (permalink / raw)
  To: kuba, davem; +Cc: netdev, b.a.t.m.a.n

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 288201630ceb..2486efe4ffa6 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.20.1

^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH 2/4] batman-adv: Update copyright years for 2021
  2021-02-02 17:40 [PATCH 0/4] pull request for net-next: batman-adv 2021-02-02 Simon Wunderlich
  2021-02-02 17:40 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
@ 2021-02-02 17:40 ` Simon Wunderlich
  2021-02-04  0:35   ` Jakub Kicinski
  2021-02-02 17:40 ` [PATCH 3/4] batman-adv: Avoid sizeof on flexible structure Simon Wunderlich
  2021-02-02 17:40 ` [PATCH 4/4] batman-adv: Fix names for kernel-doc blocks Simon Wunderlich
  3 siblings, 1 reply; 16+ messages in thread
From: Simon Wunderlich @ 2021-02-02 17:40 UTC (permalink / raw)
  To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Sven Eckelmann, Simon Wunderlich

From: Sven Eckelmann <sven@narfation.org>

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
 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/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/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/tp_meter.c              | 2 +-
 net/batman-adv/tp_meter.h              | 2 +-
 net/batman-adv/trace.c                 | 2 +-
 net/batman-adv/trace.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 +-
 57 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/include/uapi/linux/batadv_packet.h b/include/uapi/linux/batadv_packet.h
index 9c8604c5b5f6..67b773ea0ec3 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-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/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h
index bdb317faa1dc..27d35e7f1509 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2016-2021  B.A.T.M.A.N. contributors:
  *
  * Matthias Schiffer
  */
diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig
index 993afd5ff7bb..497ad1cf4a93 100644
--- a/net/batman-adv/Kconfig
+++ b/net/batman-adv/Kconfig
@@ -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, Simon Wunderlich
 
diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile
index 8010c34b987c..c50717379c85 100644
--- a/net/batman-adv/Makefile
+++ b/net/batman-adv/Makefile
@@ -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, Simon Wunderlich
 
diff --git a/net/batman-adv/bat_algo.c b/net/batman-adv/bat_algo.c
index c5f404f6892f..8b66a57ad733 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-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/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h
index 43b045ac8ac7..4073fa7efbfa 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2011-2021  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 168621c9a081..4c583eec45c6 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-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/net/batman-adv/bat_iv_ogm.h b/net/batman-adv/bat_iv_ogm.h
index 0c57c1000c64..b6e7f3226079 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-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/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
index e4455babe4c2..089b3e50fae8 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2013-2021  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 5e0be10bc84e..bc07ae6ae799 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2011-2021  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 0512ea6cd818..3f01881b185c 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2011-2021  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 4358d436be2a..5c6780795837 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2013-2021  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 798d659855d0..20d7928c2ad6 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2013-2021  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 0ae2575f70bb..a509004f9270 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2013-2021  B.A.T.M.A.N. contributors:
  *
  * Antonio Quartulli
  */
diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c
index 4bc695cda397..27be6caeed65 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-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/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h
index 533c6d44cb58..704afafa9dfd 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-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/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index d2de12e527ba..d4184bfb624b 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2011-2021  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 7dc6d3571925..73f012069226 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2011-2021  B.A.T.M.A.N. contributors:
  *
  * Simon Wunderlich
  */
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index fd7ba6bbdf85..443682a95af2 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2011-2021  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 e980fb45693a..efa2a0d01a4a 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2011-2021  B.A.T.M.A.N. contributors:
  *
  * Antonio Quartulli
  */
diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
index e522f1fcfd9a..89344632cffc 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2013-2021  B.A.T.M.A.N. contributors:
  *
  * Martin Hundebøll <martin@hundeboll.net>
  */
diff --git a/net/batman-adv/fragmentation.h b/net/batman-adv/fragmentation.h
index 881ef328b6cd..86d6b856425a 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2013-2021  B.A.T.M.A.N. contributors:
  *
  * Martin Hundebøll <martin@hundeboll.net>
  */
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index cffe72f4edd7..2ebfe62d94d0 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021  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 2fbc500f0ac1..5c8c0b923e57 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021  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 16cd9450ceb1..7208b7ad449e 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021  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 c3a0c5a7f7e9..9ccf195aad90 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021  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 0f186ddc15e3..6e3c7a6c09d6 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-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/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h
index f4b8e9efef19..bfaf4f88263f 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-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/net/batman-adv/hash.c b/net/batman-adv/hash.c
index 68638e0450a6..1bcfdcf4c608 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-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/net/batman-adv/hash.h b/net/batman-adv/hash.h
index 91ae9f32b580..276b3080c6fc 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-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/net/batman-adv/log.c b/net/batman-adv/log.c
index b7e9923b11a2..7db2005822e2 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2010-2021  B.A.T.M.A.N. contributors:
  *
  * Marek Lindner
  */
diff --git a/net/batman-adv/log.h b/net/batman-adv/log.h
index 979864c0fa6b..1f50296d51fc 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-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/net/batman-adv/main.c b/net/batman-adv/main.c
index ed9d87ce3407..e3eadd64b5a9 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-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/net/batman-adv/main.h b/net/batman-adv/main.h
index 2486efe4ffa6..1360eb09a8fa 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-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/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
index 854e5ff28a3f..8db5d285c433 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2014-2021  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 d61593d02072..d13efd4b0d75 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2014-2021  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 97bcf149633d..8eef71a62a5a 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2016-2021  B.A.T.M.A.N. contributors:
  *
  * Matthias Schiffer
  */
diff --git a/net/batman-adv/netlink.h b/net/batman-adv/netlink.h
index 7ee48f916997..48455ac28625 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2016-2021  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 0cec108b7a99..24f76101594f 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2021  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 8fb2c01e7837..e7f87d32cd1a 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2021  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 77431e59b228..88496f4e3ce0 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2009-2021  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 e75d4c4d11f5..620d02f765b7 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-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/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 49cbca4aa428..7cc6a5493108 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-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/net/batman-adv/routing.h b/net/batman-adv/routing.h
index 2ed49db6eff5..242380916c37 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-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/net/batman-adv/send.c b/net/batman-adv/send.c
index 87017332b567..990e5854d4f1 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-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/net/batman-adv/send.h b/net/batman-adv/send.h
index 0d36e15589f6..27c45eec877e 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-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/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 97118efbe678..7395a545d5af 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-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/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h
index 74716d9ca4f6..34d4f5838f23 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2021  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 d4e10005df6c..e61925f19f66 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2021  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 140105215aa2..0b7904bd32d0 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2012-2021  B.A.T.M.A.N. contributors:
  *
  * Edo Monticelli, Antonio Quartulli
  */
diff --git a/net/batman-adv/trace.c b/net/batman-adv/trace.c
index 3444d9e4e90d..b2452822f56b 100644
--- a/net/batman-adv/trace.c
+++ b/net/batman-adv/trace.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2010-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2010-2021  B.A.T.M.A.N. contributors:
  *
  * Sven Eckelmann
  */
diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h
index a87547570b4e..bd5e45251692 100644
--- a/net/batman-adv/trace.h
+++ b/net/batman-adv/trace.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (C) 2010-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2010-2021  B.A.T.M.A.N. contributors:
  *
  * Sven Eckelmann
  */
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index cd09916f97fe..badf1439f05b 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2021  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 57192c817229..913c44552173 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2021  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 6a23a566cde1..7de7dd720732 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-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/net/batman-adv/tvlv.h b/net/batman-adv/tvlv.h
index d509d00c7a23..4c3265d344b1 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-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/net/batman-adv/types.h b/net/batman-adv/types.h
index 2f96e96a5ca4..65985e262cde 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-2020  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2021  B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  */
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH 3/4] batman-adv: Avoid sizeof on flexible structure
  2021-02-02 17:40 [PATCH 0/4] pull request for net-next: batman-adv 2021-02-02 Simon Wunderlich
  2021-02-02 17:40 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
  2021-02-02 17:40 ` [PATCH 2/4] batman-adv: Update copyright years for 2021 Simon Wunderlich
@ 2021-02-02 17:40 ` Simon Wunderlich
  2021-02-02 17:40 ` [PATCH 4/4] batman-adv: Fix names for kernel-doc blocks Simon Wunderlich
  3 siblings, 0 replies; 16+ messages in thread
From: Simon Wunderlich @ 2021-02-02 17:40 UTC (permalink / raw)
  To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Sven Eckelmann, Simon Wunderlich

From: Sven Eckelmann <sven@narfation.org>

The batadv_dhcp_packet is used to read in parts of the DHCP packet and
extract relevant information for the distributed arp table. But the
structure contained the flexible member "options" which is no where used in
the code.

A sizeof on this kind of type would return the size of everything except
the flexible member. But sparse will detect this kind of sizeof and warn
with

  warning: using sizeof on a flexible structure

This can be avoided by dropping the unused flexible member.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
 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 443682a95af2..61a6cfef2742 100644
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -87,7 +87,7 @@ struct batadv_dhcp_packet {
 	__u8 sname[64];
 	__u8 file[128];
 	__be32 magic;
-	__u8 options[];
+	/* __u8 options[]; */
 };
 
 #define BATADV_DHCP_YIADDR_LEN sizeof(((struct batadv_dhcp_packet *)0)->yiaddr)
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [PATCH 4/4] batman-adv: Fix names for kernel-doc blocks
  2021-02-02 17:40 [PATCH 0/4] pull request for net-next: batman-adv 2021-02-02 Simon Wunderlich
                   ` (2 preceding siblings ...)
  2021-02-02 17:40 ` [PATCH 3/4] batman-adv: Avoid sizeof on flexible structure Simon Wunderlich
@ 2021-02-02 17:40 ` Simon Wunderlich
  3 siblings, 0 replies; 16+ messages in thread
From: Simon Wunderlich @ 2021-02-02 17:40 UTC (permalink / raw)
  To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Sven Eckelmann, Simon Wunderlich

From: Sven Eckelmann <sven@narfation.org>

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@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
 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 61a6cfef2742..fcabd6b1e77f 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 8db5d285c433..ad216c42406f 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 8eef71a62a5a..c80527b879a7 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 e61925f19f66..72ec4aab4813 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 65985e262cde..aae7366bb679 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.20.1


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [PATCH 1/4] batman-adv: Start new development cycle
  2021-02-02 17:40 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
@ 2021-02-04  0:33   ` Jakub Kicinski
  2021-02-04  7:41     ` Sven Eckelmann
  0 siblings, 1 reply; 16+ messages in thread
From: Jakub Kicinski @ 2021-02-04  0:33 UTC (permalink / raw)
  To: Simon Wunderlich; +Cc: davem, netdev, b.a.t.m.a.n

On Tue,  2 Feb 2021 18:40:33 +0100 Simon Wunderlich wrote:
> 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 288201630ceb..2486efe4ffa6 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 */

For just comment adjustments and the sizeof() change?

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 2/4] batman-adv: Update copyright years for 2021
  2021-02-02 17:40 ` [PATCH 2/4] batman-adv: Update copyright years for 2021 Simon Wunderlich
@ 2021-02-04  0:35   ` Jakub Kicinski
  2021-02-04  0:37     ` Randy Dunlap
  2021-02-04  7:54     ` Sven Eckelmann
  0 siblings, 2 replies; 16+ messages in thread
From: Jakub Kicinski @ 2021-02-04  0:35 UTC (permalink / raw)
  To: Simon Wunderlich; +Cc: davem, netdev, b.a.t.m.a.n, Sven Eckelmann

On Tue,  2 Feb 2021 18:40:34 +0100 Simon Wunderlich wrote:
> From: Sven Eckelmann <sven@narfation.org>
> 
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
> ---
>  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/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/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/tp_meter.c              | 2 +-
>  net/batman-adv/tp_meter.h              | 2 +-
>  net/batman-adv/trace.c                 | 2 +-
>  net/batman-adv/trace.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 +-
>  57 files changed, 57 insertions(+), 57 deletions(-)
> 
> diff --git a/include/uapi/linux/batadv_packet.h b/include/uapi/linux/batadv_packet.h
> index 9c8604c5b5f6..67b773ea0ec3 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-2020  B.A.T.M.A.N. contributors:
> +/* Copyright (C) 2007-2021  B.A.T.M.A.N. contributors:
>   *
>   * Marek Lindner, Simon Wunderlich
>   */

Is this how copyright works? I'm not a layer, but I thought it was
supposed to reflect changes done to given file in a given year.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 2/4] batman-adv: Update copyright years for 2021
  2021-02-04  0:35   ` Jakub Kicinski
@ 2021-02-04  0:37     ` Randy Dunlap
  2021-02-04  7:54     ` Sven Eckelmann
  1 sibling, 0 replies; 16+ messages in thread
From: Randy Dunlap @ 2021-02-04  0:37 UTC (permalink / raw)
  To: Jakub Kicinski, Simon Wunderlich
  Cc: davem, netdev, b.a.t.m.a.n, Sven Eckelmann

On 2/3/21 4:35 PM, Jakub Kicinski wrote:
> On Tue,  2 Feb 2021 18:40:34 +0100 Simon Wunderlich wrote:
>> From: Sven Eckelmann <sven@narfation.org>
>>
>> Signed-off-by: Sven Eckelmann <sven@narfation.org>
>> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
>> ---
>>  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/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/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/tp_meter.c              | 2 +-
>>  net/batman-adv/tp_meter.h              | 2 +-
>>  net/batman-adv/trace.c                 | 2 +-
>>  net/batman-adv/trace.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 +-
>>  57 files changed, 57 insertions(+), 57 deletions(-)
>>
>> diff --git a/include/uapi/linux/batadv_packet.h b/include/uapi/linux/batadv_packet.h
>> index 9c8604c5b5f6..67b773ea0ec3 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-2020  B.A.T.M.A.N. contributors:
>> +/* Copyright (C) 2007-2021  B.A.T.M.A.N. contributors:
>>   *
>>   * Marek Lindner, Simon Wunderlich
>>   */
> 
> Is this how copyright works? I'm not a layer, but I thought it was
> supposed to reflect changes done to given file in a given year.

I'm not a lawyer either, but that is how we usually do it (as
Jakub describes).

-- 
~Randy


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 1/4] batman-adv: Start new development cycle
  2021-02-04  0:33   ` Jakub Kicinski
@ 2021-02-04  7:41     ` Sven Eckelmann
  0 siblings, 0 replies; 16+ messages in thread
From: Sven Eckelmann @ 2021-02-04  7:41 UTC (permalink / raw)
  To: Simon Wunderlich, b.a.t.m.a.n; +Cc: davem, netdev, Jakub Kicinski

[-- Attachment #1: Type: text/plain, Size: 460 bytes --]

On Thursday, 4 February 2021 01:33:02 CET Jakub Kicinski wrote:
[...]
> For just comment adjustments and the sizeof() change?

The process is basically:

1. update the version information for a development period
2. queue up whatever comes in during that time
3. send it to netdev for net-next when it seems to be ready

The first step is not influenced by the 2.+3. step. So the development 
effort is not reflected in the version number.

Kind regards,
	Sven

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 2/4] batman-adv: Update copyright years for 2021
  2021-02-04  0:35   ` Jakub Kicinski
  2021-02-04  0:37     ` Randy Dunlap
@ 2021-02-04  7:54     ` Sven Eckelmann
  2021-02-04 19:58       ` Jakub Kicinski
  1 sibling, 1 reply; 16+ messages in thread
From: Sven Eckelmann @ 2021-02-04  7:54 UTC (permalink / raw)
  To: Simon Wunderlich, Jakub Kicinski; +Cc: davem, netdev, b.a.t.m.a.n

[-- Attachment #1: Type: text/plain, Size: 1050 bytes --]

On Thursday, 4 February 2021 01:35:06 CET Jakub Kicinski wrote:
[...]
> Is this how copyright works? I'm not a layer, but I thought it was
> supposed to reflect changes done to given file in a given year.

<irony>Because we all know that the first thing a person is doing when 
submitting a change is to update the copyright year.</irony>

So we have either the option to:

* not update it at all (as in many kernel sources)
* don't have it listed explicitly (as seen in other kernel sources)
* update it once a year

I personally like to have a simple solution so I don't have to deal with this 
kind of details while doing interesting things. The current "solution"
was to handle the copyright notices year for the whole project as one entity - 
once per year and then ignore it for the rest of the year.

And I would also prefer not to start a discussion about the differences 
between the inalienable German Urheberrecht, pre 1989 anglo-american 
copyright, post 1989 anglo american copyright and other copyright like laws.

Kind regards,
	Sven


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 2/4] batman-adv: Update copyright years for 2021
  2021-02-04  7:54     ` Sven Eckelmann
@ 2021-02-04 19:58       ` Jakub Kicinski
  2021-02-05  7:47         ` Sven Eckelmann
  0 siblings, 1 reply; 16+ messages in thread
From: Jakub Kicinski @ 2021-02-04 19:58 UTC (permalink / raw)
  To: Sven Eckelmann; +Cc: Simon Wunderlich, davem, netdev, b.a.t.m.a.n

On Thu, 04 Feb 2021 08:54:33 +0100 Sven Eckelmann wrote:
> On Thursday, 4 February 2021 01:35:06 CET Jakub Kicinski wrote:
> [...]
> > Is this how copyright works? I'm not a layer, but I thought it was
> > supposed to reflect changes done to given file in a given year.  
> 
> <irony>Because we all know that the first thing a person is doing when 
> submitting a change is to update the copyright year.</irony>
> 
> So we have either the option to:
> 
> * not update it at all (as in many kernel sources)
> * don't have it listed explicitly (as seen in other kernel sources)
> * update it once a year
> 
> I personally like to have a simple solution so I don't have to deal with this 
> kind of details while doing interesting things. The current "solution"
> was to handle the copyright notices year for the whole project as one entity - 
> once per year and then ignore it for the rest of the year.

Back when I was working for a vendor I had a script which used git to
find files touched in current year and then a bit of sed to update the
dates. Instead of running your current script every Jan, you can run
that one every Dec.

> And I would also prefer not to start a discussion about the differences 
> between the inalienable German Urheberrecht, pre 1989 anglo-american 
> copyright, post 1989 anglo american copyright and other copyright like laws.

No need, we can depend on common sense. I hope you understand that a
pull request which updates 8 lines of code, mostly comments, and then
contains a version bump + 57 lines of copyright bumps is very likely 
to give people a pause, right?

If you strongly prefer the current model please add appropriate commit
messages justifying it and repost. Right now patch 1 and 2 have none.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 2/4] batman-adv: Update copyright years for 2021
  2021-02-04 19:58       ` Jakub Kicinski
@ 2021-02-05  7:47         ` Sven Eckelmann
  2021-02-05 19:37           ` Jakub Kicinski
  0 siblings, 1 reply; 16+ messages in thread
From: Sven Eckelmann @ 2021-02-05  7:47 UTC (permalink / raw)
  To: Jakub Kicinski; +Cc: davem, netdev, b.a.t.m.a.n

[-- Attachment #1: Type: text/plain, Size: 702 bytes --]

On Thursday, 4 February 2021 20:58:36 CET Jakub Kicinski wrote:
> Back when I was working for a vendor I had a script which used git to
> find files touched in current year and then a bit of sed to update the
> dates. Instead of running your current script every Jan, you can run
> that one every Dec.

Just as an additional anecdote: Just had the situation that a vendor 
complained that the user visible copyright notice was still 2020 for a project 
published in 2021 but developed and tested 2020 (and thus tagged + packaged in 
2020).

Now to something more relevant: what do you think about dropping the copyright 
year [1]?

Kind regards,
	Sven

[1] https://reuse.software/faq/#years-copyright


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 2/4] batman-adv: Update copyright years for 2021
  2021-02-05  7:47         ` Sven Eckelmann
@ 2021-02-05 19:37           ` Jakub Kicinski
  0 siblings, 0 replies; 16+ messages in thread
From: Jakub Kicinski @ 2021-02-05 19:37 UTC (permalink / raw)
  To: Sven Eckelmann; +Cc: Simon Wunderlich, davem, netdev, b.a.t.m.a.n

On Fri, 05 Feb 2021 08:47:38 +0100 Sven Eckelmann wrote:
> On Thursday, 4 February 2021 20:58:36 CET Jakub Kicinski wrote:
> > Back when I was working for a vendor I had a script which used git to
> > find files touched in current year and then a bit of sed to update the
> > dates. Instead of running your current script every Jan, you can run
> > that one every Dec.  
> 
> Just as an additional anecdote: Just had the situation that a vendor 
> complained that the user visible copyright notice was still 2020 for a project 
> published in 2021 but developed and tested 2020 (and thus tagged + packaged in 
> 2020).
> 
> Now to something more relevant: what do you think about dropping the copyright 
> year [1]?

Interesting! In my own code I do option 1, copyright protection is
longer than the code I write is relevant :S 

3 seems to be what US lawyers like but frankly in the git era they are
probably overly lazy^W cautious.

Option 4 seems nice as well - it's really up to you(r lawyer).

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 4/4] batman-adv: Fix names for kernel-doc blocks
  2021-02-08 18:00   ` Randy Dunlap
@ 2021-02-08 19:35     ` Jakub Kicinski
  0 siblings, 0 replies; 16+ messages in thread
From: Jakub Kicinski @ 2021-02-08 19:35 UTC (permalink / raw)
  To: Randy Dunlap; +Cc: Simon Wunderlich, davem, netdev, b.a.t.m.a.n, Sven Eckelmann

On Mon, 8 Feb 2021 10:00:48 -0800 Randy Dunlap wrote:
> On 2/8/21 8:59 AM, Simon Wunderlich wrote:
> > From: Sven Eckelmann <sven@narfation.org>
> > 
> > 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@narfation.org>
> > Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>  
> 
> Reviewed-by: Randy Dunlap <rdunlap@infradead.org>

Thanks!

Just FWIW since this is a pull request I can't add tags on individual
patches in git, but it will be recorded on the list, I guess..

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH 4/4] batman-adv: Fix names for kernel-doc blocks
  2021-02-08 16:59 ` [PATCH 4/4] batman-adv: Fix names for kernel-doc blocks Simon Wunderlich
@ 2021-02-08 18:00   ` Randy Dunlap
  2021-02-08 19:35     ` Jakub Kicinski
  0 siblings, 1 reply; 16+ messages in thread
From: Randy Dunlap @ 2021-02-08 18:00 UTC (permalink / raw)
  To: Simon Wunderlich, kuba, davem; +Cc: netdev, b.a.t.m.a.n, Sven Eckelmann

On 2/8/21 8:59 AM, Simon Wunderlich wrote:
> From: Sven Eckelmann <sven@narfation.org>
> 
> 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@narfation.org>
> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>

Reviewed-by: Randy Dunlap <rdunlap@infradead.org>

Thanks.

> ---
>  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(-)


-- 
~Randy


^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 4/4] batman-adv: Fix names for kernel-doc blocks
  2021-02-08 16:59 [PATCH 0/4] pull request for net-next: batman-adv 2021-02-08 Simon Wunderlich
@ 2021-02-08 16:59 ` Simon Wunderlich
  2021-02-08 18:00   ` Randy Dunlap
  0 siblings, 1 reply; 16+ messages in thread
From: Simon Wunderlich @ 2021-02-08 16:59 UTC (permalink / raw)
  To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Sven Eckelmann, Simon Wunderlich

From: Sven Eckelmann <sven@narfation.org>

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@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
 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 2542d85a59b4..8c95a11a830a 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 71d0bc323471..28166402d30c 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 fdd76eeaa6be..f317d206b411 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 07e6c1d864a4..789c851732b7 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 2c654ec964b7..7c0b475cc22a 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.20.1


^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2021-02-08 19:35 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-02 17:40 [PATCH 0/4] pull request for net-next: batman-adv 2021-02-02 Simon Wunderlich
2021-02-02 17:40 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
2021-02-04  0:33   ` Jakub Kicinski
2021-02-04  7:41     ` Sven Eckelmann
2021-02-02 17:40 ` [PATCH 2/4] batman-adv: Update copyright years for 2021 Simon Wunderlich
2021-02-04  0:35   ` Jakub Kicinski
2021-02-04  0:37     ` Randy Dunlap
2021-02-04  7:54     ` Sven Eckelmann
2021-02-04 19:58       ` Jakub Kicinski
2021-02-05  7:47         ` Sven Eckelmann
2021-02-05 19:37           ` Jakub Kicinski
2021-02-02 17:40 ` [PATCH 3/4] batman-adv: Avoid sizeof on flexible structure Simon Wunderlich
2021-02-02 17:40 ` [PATCH 4/4] batman-adv: Fix names for kernel-doc blocks Simon Wunderlich
2021-02-08 16:59 [PATCH 0/4] pull request for net-next: batman-adv 2021-02-08 Simon Wunderlich
2021-02-08 16:59 ` [PATCH 4/4] batman-adv: Fix names for kernel-doc blocks Simon Wunderlich
2021-02-08 18:00   ` Randy Dunlap
2021-02-08 19:35     ` Jakub Kicinski

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).