* [PATCH 0/4] pull request for net-next: batman-adv 2024-02-01
@ 2024-02-01 11:07 Simon Wunderlich
2024-02-01 11:07 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
` (3 more replies)
0 siblings, 4 replies; 18+ messages in thread
From: Simon Wunderlich @ 2024-02-01 11:07 UTC (permalink / raw)
To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich
Hi Jakub, hi David,
here is a 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 6613476e225e090cc9aad49be7fa504e290dd33d:
Linux 6.8-rc1 (2024-01-21 14:11:32 -0800)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20240201
for you to fetch changes up to db60ad8b21cee0394cb0a1092d9f9190d310562c:
batman-adv: Drop usage of export.h (2024-01-27 09:13:59 +0100)
----------------------------------------------------------------
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Improve error handling in DAT and uevent generator,
by Markus Elfring (2 patches)
- Drop usage of export.h, by Sven Eckelmann
----------------------------------------------------------------
Markus Elfring (2):
batman-adv: Return directly after a failed batadv_dat_select_candidates() in batadv_dat_forward_data()
batman-adv: Improve exception handling in batadv_throw_uevent()
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (1):
batman-adv: Drop usage of export.h
net/batman-adv/distributed-arp-table.c | 3 +--
net/batman-adv/main.c | 14 ++++++++------
net/batman-adv/main.h | 2 +-
net/batman-adv/netlink.c | 1 -
4 files changed, 10 insertions(+), 10 deletions(-)
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 1/4] batman-adv: Start new development cycle
2024-02-01 11:07 [PATCH 0/4] pull request for net-next: batman-adv 2024-02-01 Simon Wunderlich
@ 2024-02-01 11:07 ` Simon Wunderlich
2024-02-02 12:50 ` patchwork-bot+netdevbpf
2024-02-01 11:07 ` [PATCH 2/4] batman-adv: Return directly after a failed batadv_dat_select_candidates() in batadv_dat_forward_data() Simon Wunderlich
` (2 subsequent siblings)
3 siblings, 1 reply; 18+ messages in thread
From: Simon Wunderlich @ 2024-02-01 11:07 UTC (permalink / raw)
To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich
This version will contain all the (major or even only minor) changes for
Linux 6.9.
The version number isn't a semantic version number with major and minor
information. It is just encoding the year of the expected publishing as
Linux -rc1 and the number of published versions this year (starting at 0).
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
net/batman-adv/main.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 870dcd7f1786..8ca854a75a32 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 "2024.0"
+#define BATADV_SOURCE_VERSION "2024.1"
#endif
/* B.A.T.M.A.N. parameters */
--
2.39.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 2/4] batman-adv: Return directly after a failed batadv_dat_select_candidates() in batadv_dat_forward_data()
2024-02-01 11:07 [PATCH 0/4] pull request for net-next: batman-adv 2024-02-01 Simon Wunderlich
2024-02-01 11:07 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
@ 2024-02-01 11:07 ` Simon Wunderlich
2024-02-01 11:07 ` [PATCH 3/4] batman-adv: Improve exception handling in batadv_throw_uevent() Simon Wunderlich
2024-02-01 11:07 ` [PATCH 4/4] batman-adv: Drop usage of export.h Simon Wunderlich
3 siblings, 0 replies; 18+ messages in thread
From: Simon Wunderlich @ 2024-02-01 11:07 UTC (permalink / raw)
To: kuba, davem
Cc: netdev, b.a.t.m.a.n, Markus Elfring, Sven Eckelmann,
Simon Wunderlich
From: Markus Elfring <elfring@users.sourceforge.net>
The kfree() function was called in one case by
the batadv_dat_forward_data() function during error handling
even if the passed variable contained a null pointer.
This issue was detected by using the Coccinelle software.
* Thus return directly after a batadv_dat_select_candidates() call failed
at the beginning.
* Delete the label “out” which became unnecessary with this refactoring.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
net/batman-adv/distributed-arp-table.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index 28a939d56090..4c7e85534324 100644
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -684,7 +684,7 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv,
cand = batadv_dat_select_candidates(bat_priv, ip, vid);
if (!cand)
- goto out;
+ return ret;
batadv_dbg(BATADV_DBG_DAT, bat_priv, "DHT_SEND for %pI4\n", &ip);
@@ -728,7 +728,6 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv,
batadv_orig_node_put(cand[i].orig_node);
}
-out:
kfree(cand);
return ret;
}
--
2.39.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 3/4] batman-adv: Improve exception handling in batadv_throw_uevent()
2024-02-01 11:07 [PATCH 0/4] pull request for net-next: batman-adv 2024-02-01 Simon Wunderlich
2024-02-01 11:07 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
2024-02-01 11:07 ` [PATCH 2/4] batman-adv: Return directly after a failed batadv_dat_select_candidates() in batadv_dat_forward_data() Simon Wunderlich
@ 2024-02-01 11:07 ` Simon Wunderlich
2024-02-01 11:07 ` [PATCH 4/4] batman-adv: Drop usage of export.h Simon Wunderlich
3 siblings, 0 replies; 18+ messages in thread
From: Simon Wunderlich @ 2024-02-01 11:07 UTC (permalink / raw)
To: kuba, davem
Cc: netdev, b.a.t.m.a.n, Markus Elfring, Sven Eckelmann,
Simon Wunderlich
From: Markus Elfring <elfring@users.sourceforge.net>
The kfree() function was called in up to three cases by
the batadv_throw_uevent() function during error handling
even if the passed variable contained a null pointer.
This issue was detected by using the Coccinelle software.
* Thus adjust jump targets.
* Reorder kfree() calls at the end.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
net/batman-adv/main.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 5fc754b0b3f7..75119f1ffccc 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -691,29 +691,31 @@ int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type,
"%s%s", BATADV_UEV_TYPE_VAR,
batadv_uev_type_str[type]);
if (!uevent_env[0])
- goto out;
+ goto report_error;
uevent_env[1] = kasprintf(GFP_ATOMIC,
"%s%s", BATADV_UEV_ACTION_VAR,
batadv_uev_action_str[action]);
if (!uevent_env[1])
- goto out;
+ goto free_first_env;
/* If the event is DEL, ignore the data field */
if (action != BATADV_UEV_DEL) {
uevent_env[2] = kasprintf(GFP_ATOMIC,
"%s%s", BATADV_UEV_DATA_VAR, data);
if (!uevent_env[2])
- goto out;
+ goto free_second_env;
}
ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env);
-out:
- kfree(uevent_env[0]);
- kfree(uevent_env[1]);
kfree(uevent_env[2]);
+free_second_env:
+ kfree(uevent_env[1]);
+free_first_env:
+ kfree(uevent_env[0]);
if (ret)
+report_error:
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
"Impossible to send uevent for (%s,%s,%s) event (err: %d)\n",
batadv_uev_type_str[type],
--
2.39.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 4/4] batman-adv: Drop usage of export.h
2024-02-01 11:07 [PATCH 0/4] pull request for net-next: batman-adv 2024-02-01 Simon Wunderlich
` (2 preceding siblings ...)
2024-02-01 11:07 ` [PATCH 3/4] batman-adv: Improve exception handling in batadv_throw_uevent() Simon Wunderlich
@ 2024-02-01 11:07 ` Simon Wunderlich
3 siblings, 0 replies; 18+ messages in thread
From: Simon Wunderlich @ 2024-02-01 11:07 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 linux/export.h include was introduced in commit 9bcb94c8617e
("batman-adv: Introduce missing headers for genetlink restructure") to have
access to THIS_MODULE. But with commit 5b20755b7780 ("init: move
THIS_MODULE from <linux/export.h> to <linux/init.h>"), it was moved and the
include for export.h is no longer needed.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
net/batman-adv/netlink.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
index 1f7ed9d4f6fd..0954757f0b8b 100644
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -15,7 +15,6 @@
#include <linux/cache.h>
#include <linux/err.h>
#include <linux/errno.h>
-#include <linux/export.h>
#include <linux/genetlink.h>
#include <linux/gfp.h>
#include <linux/if_ether.h>
--
2.39.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 0/4] pull request for net-next: batman-adv 2024-10-15
@ 2024-10-15 7:39 Simon Wunderlich
2024-10-15 7:39 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
0 siblings, 1 reply; 18+ messages in thread
From: Simon Wunderlich @ 2024-10-15 7:39 UTC (permalink / raw)
To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich
Hi Jakub, hi David,
here is a feature/cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit 9852d85ec9d492ebef56dc5f229416c925758edc:
Linux 6.12-rc1 (2024-09-29 15:06:19 -0700)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20241015
for you to fetch changes up to 356c81b6c494a359ed6e25087931acc78c518fb9:
batman-adv: replace call_rcu by kfree_rcu for simple kmem_cache_free callback (2024-10-14 09:08:39 +0200)
----------------------------------------------------------------
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Add flex array to struct batadv_tvlv_tt_data, by Erick Archer
- Use string choice helper to print booleans, by Sven Eckelmann
- replace call_rcu by kfree_rcu for simple kmem_cache_free callback,
by Julia Lawall
----------------------------------------------------------------
Erick Archer (1):
batman-adv: Add flex array to struct batadv_tvlv_tt_data
Julia Lawall (1):
batman-adv: replace call_rcu by kfree_rcu for simple kmem_cache_free callback
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (1):
batman-adv: Use string choice helper to print booleans
include/uapi/linux/batadv_packet.h | 29 +++++-----
net/batman-adv/bat_iv_ogm.c | 4 +-
net/batman-adv/bridge_loop_avoidance.c | 8 +--
net/batman-adv/main.h | 2 +-
net/batman-adv/translation-table.c | 96 ++++++++--------------------------
5 files changed, 46 insertions(+), 93 deletions(-)
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 0/4] pull request for net-next: batman-adv 2022-09-16
@ 2022-09-16 16:14 Simon Wunderlich
2022-09-16 16:14 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
0 siblings, 1 reply; 18+ messages in thread
From: Simon Wunderlich @ 2022-09-16 16:14 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 568035b01cfb107af8d2e4bd2fb9aea22cf5b868:
Linux 6.0-rc1 (2022-08-14 15:50:18 -0700)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20220916
for you to fetch changes up to 76af7483b3c7c42571aae767b553ef7d436305e9:
batman-adv: remove unused struct definitions (2022-09-15 08:16:05 +0200)
----------------------------------------------------------------
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- drop unused headers in trace.h, by Sven Eckelmann
- drop initialization of flexible ethtool_link_ksettings,
by Sven Eckelmann
- remove unused struct definitions, by Marek Lindner
----------------------------------------------------------------
Marek Lindner (1):
batman-adv: remove unused struct definitions
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (2):
batman-adv: Drop unused headers in trace.h
batman-adv: Drop initialization of flexible ethtool_link_ksettings
net/batman-adv/bat_v_elp.c | 1 -
net/batman-adv/main.h | 2 +-
net/batman-adv/trace.h | 2 --
net/batman-adv/types.h | 39 ---------------------------------------
4 files changed, 1 insertion(+), 43 deletions(-)
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 0/4] pull request for net-next: batman-adv 2022-03-02
@ 2022-03-02 16:35 Simon Wunderlich
2022-03-02 16:35 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
0 siblings, 1 reply; 18+ messages in thread
From: Simon Wunderlich @ 2022-03-02 16:35 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!
There might be a small merge conflict between the net and net-next pull
requests which I both send today, specifically those two commits:
* (batadv/net) 690bb6fb64f5 ("batman-adv: Request iflink once in batadv-on-batadv check")
* (batadv/net-next) 6ee3c393eeb7 ("batman-adv: Demote batadv-on-batadv skip error message")
They should be resolved like this:
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -167,13 +167,7 @@
return false;
/* recurse over the parent device */
-<<<<<<<
- parent_dev = __dev_get_by_index((struct net *)parent_net,
- dev_get_iflink(net_dev));
-=======
parent_dev = __dev_get_by_index((struct net *)parent_net, iflink);
- /* if we got a NULL parent_dev there is something broken.. */
->>>>>>>
if (!parent_dev) {
pr_warn("Cannot find parent device. Skipping batadv-on-batadv check for %s\n",
net_dev->name);
Thank you,
Simon
The following changes since commit e783362eb54cd99b2cac8b3a9aeac942e6f6ac07:
Linux 5.17-rc1 (2022-01-23 10:12:53 +0200)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20220302
for you to fetch changes up to 6ee3c393eeb7d16a3c228c4fa23913b76c7e7df3:
batman-adv: Demote batadv-on-batadv skip error message (2022-03-02 09:00:17 +0100)
----------------------------------------------------------------
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Remove redundant 'flush_workqueue()' calls, by Christophe JAILLET
- Migrate to linux/container_of.h, by Sven Eckelmann
- Demote batadv-on-batadv skip error message, by Sven Eckelmann
----------------------------------------------------------------
Christophe JAILLET (1):
batman-adv: Remove redundant 'flush_workqueue()' calls
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (2):
batman-adv: Migrate to linux/container_of.h
batman-adv: Demote batadv-on-batadv skip error message
net/batman-adv/bat_iv_ogm.c | 2 +-
net/batman-adv/bat_v_elp.c | 2 +-
net/batman-adv/bat_v_ogm.c | 2 +-
net/batman-adv/bridge_loop_avoidance.c | 1 +
net/batman-adv/distributed-arp-table.c | 2 +-
net/batman-adv/gateway_client.c | 1 +
net/batman-adv/hard-interface.c | 6 +++---
net/batman-adv/main.c | 2 +-
net/batman-adv/main.h | 2 +-
net/batman-adv/multicast.c | 1 +
net/batman-adv/network-coding.c | 2 +-
net/batman-adv/originator.c | 2 +-
net/batman-adv/send.c | 2 +-
net/batman-adv/soft-interface.c | 2 +-
net/batman-adv/tp_meter.c | 2 +-
net/batman-adv/translation-table.c | 2 +-
net/batman-adv/tvlv.c | 2 +-
17 files changed, 19 insertions(+), 16 deletions(-)
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 0/4] pull request for net-next: batman-adv 2021-02-08
@ 2021-02-08 16:59 Simon Wunderlich
2021-02-08 16:59 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
0 siblings, 1 reply; 18+ 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
Hi Jakub, hi David,
here is the updated pull request of batman-adv to go into net-next. We
have updated the first two patches as discussed (added justification
for the first, replaced the second to remove copyright years). The other
two patches are unchanged.
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-20210208
for you to fetch changes up to 25d81f9307ffc166427d93152498f45178f5936a:
batman-adv: Fix names for kernel-doc blocks (2021-02-06 09:22:45 +0100)
----------------------------------------------------------------
This feature/cleanup patchset is an updated version of the pull request
of Feb 2nd (batadv-next-pullrequest-20210202) and includes the
following patches:
- Bump version strings, by Simon Wunderlich (added commit log)
- Drop publication years from copyright info, by Sven Eckelmann
(replaced the previous patch which updated copyright years, as per
our discussion)
- Avoid sizeof on flexible structure, by Sven Eckelmann (unchanged)
- Fix names for kernel-doc blocks, by Sven Eckelmann (unchanged)
----------------------------------------------------------------
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (3):
batman-adv: Drop publication years from copyright info
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] 18+ messages in thread* [PATCH 1/4] batman-adv: Start new development cycle
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
0 siblings, 0 replies; 18+ 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
This version will contain all the (major or even only minor) changes for
Linux 5.12.
The version number isn't a semantic version number with major and minor
information. It is just encoding the year of the expected publishing as
Linux -rc1 and the number of published versions this year (starting at 0).
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
net/batman-adv/main.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 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] 18+ messages in thread
* [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
0 siblings, 1 reply; 18+ 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] 18+ 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
0 siblings, 1 reply; 18+ 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] 18+ 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; 18+ 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] 18+ messages in thread
* [PATCH 0/4] pull request for net-next: batman-adv 2020-06-26
@ 2020-06-30 8:27 Simon Wunderlich
2020-06-30 8:27 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
0 siblings, 1 reply; 18+ messages in thread
From: Simon Wunderlich @ 2020-06-30 8:27 UTC (permalink / raw)
To: davem; +Cc: netdev, b.a.t.m.a.n
Hi David,
here is a little feature/cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit b3a9e3b9622ae10064826dccb4f7a52bd88c7407:
Linux 5.8-rc1 (2020-06-14 12:45:04 -0700)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20200630
for you to fetch changes up to 3bda14d09dc5789a895ab02b7dcfcec19b0a65b3:
batman-adv: Introduce a configurable per interface hop penalty (2020-06-26 10:37:11 +0200)
----------------------------------------------------------------
This feature/cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- update mailing list URL, by Sven Eckelmann
- fix typos and grammar in documentation, by Sven Eckelmann
- introduce a configurable per interface hop penalty,
by Linus Luessing
----------------------------------------------------------------
Linus Lüssing (1):
batman-adv: Introduce a configurable per interface hop penalty
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (2):
batman-adv: Switch mailing list subscription page
batman-adv: Fix typos and grammar in documentation
Documentation/networking/batman-adv.rst | 8 +++---
include/uapi/linux/batadv_packet.h | 50 ++++++++++++++++-----------------
include/uapi/linux/batman_adv.h | 7 +++--
net/batman-adv/bat_iv_ogm.c | 25 +++++++++--------
net/batman-adv/bat_v_elp.c | 10 +++----
net/batman-adv/bat_v_ogm.c | 27 +++++++++++-------
net/batman-adv/bridge_loop_avoidance.c | 6 ++--
net/batman-adv/distributed-arp-table.c | 2 +-
net/batman-adv/fragmentation.c | 6 ++--
net/batman-adv/hard-interface.c | 16 ++++++-----
net/batman-adv/log.h | 6 ++--
net/batman-adv/main.c | 2 +-
net/batman-adv/main.h | 8 +++---
net/batman-adv/multicast.c | 21 +++++++-------
net/batman-adv/netlink.c | 14 +++++++--
net/batman-adv/network-coding.c | 14 ++++-----
net/batman-adv/originator.c | 8 +++---
net/batman-adv/routing.c | 4 +--
net/batman-adv/send.c | 4 +--
net/batman-adv/soft-interface.c | 2 +-
net/batman-adv/tp_meter.c | 12 ++++----
net/batman-adv/translation-table.c | 10 +++----
net/batman-adv/tvlv.c | 4 +--
net/batman-adv/types.h | 18 ++++++++----
24 files changed, 156 insertions(+), 128 deletions(-)
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 0/4] pull request for net-next: batman-adv 2019-08-08
@ 2019-08-08 13:06 Simon Wunderlich
2019-08-08 13:06 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
0 siblings, 1 reply; 18+ messages in thread
From: Simon Wunderlich @ 2019-08-08 13:06 UTC (permalink / raw)
To: davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich
Hi David,
here is a small feature/cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit 5f9e832c137075045d15cd6899ab0505cfb2ca4b:
Linus 5.3-rc1 (2019-07-21 14:05:38 -0700)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20190808
for you to fetch changes up to 9cb9a17813bf0de1f8ad6deb9538296d5148b5a8:
batman-adv: BATMAN_V: aggregate OGMv2 packets (2019-08-04 22:22:00 +0200)
----------------------------------------------------------------
This feature/cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Replace usage of strlcpy with strscpy, by Sven Eckelmann
- Add OGMv2 per-interface queue and aggregations, by Linus Luessing
(2 patches)
----------------------------------------------------------------
Linus Lüssing (2):
batman-adv: BATMAN_V: introduce per hard-iface OGMv2 queues
batman-adv: BATMAN_V: aggregate OGMv2 packets
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (1):
batman-adv: Replace usage of strlcpy with strscpy
net/batman-adv/bat_v.c | 7 ++
net/batman-adv/bat_v_ogm.c | 179 +++++++++++++++++++++++++++++++++++++++-
net/batman-adv/bat_v_ogm.h | 3 +
net/batman-adv/main.h | 2 +-
net/batman-adv/soft-interface.c | 8 +-
net/batman-adv/sysfs.c | 2 +-
net/batman-adv/types.h | 12 +++
7 files changed, 205 insertions(+), 8 deletions(-)
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2024-10-15 13:54 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-01 11:07 [PATCH 0/4] pull request for net-next: batman-adv 2024-02-01 Simon Wunderlich
2024-02-01 11:07 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
2024-02-02 12:50 ` patchwork-bot+netdevbpf
2024-02-01 11:07 ` [PATCH 2/4] batman-adv: Return directly after a failed batadv_dat_select_candidates() in batadv_dat_forward_data() Simon Wunderlich
2024-02-01 11:07 ` [PATCH 3/4] batman-adv: Improve exception handling in batadv_throw_uevent() Simon Wunderlich
2024-02-01 11:07 ` [PATCH 4/4] batman-adv: Drop usage of export.h Simon Wunderlich
-- strict thread matches above, loose matches on Subject: below --
2024-10-15 7:39 [PATCH 0/4] pull request for net-next: batman-adv 2024-10-15 Simon Wunderlich
2024-10-15 7:39 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
2024-10-15 13:40 ` patchwork-bot+netdevbpf
2022-09-16 16:14 [PATCH 0/4] pull request for net-next: batman-adv 2022-09-16 Simon Wunderlich
2022-09-16 16:14 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
2022-09-20 1:20 ` patchwork-bot+netdevbpf
2022-03-02 16:35 [PATCH 0/4] pull request for net-next: batman-adv 2022-03-02 Simon Wunderlich
2022-03-02 16:35 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
2022-03-03 6:10 ` patchwork-bot+netdevbpf
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 1/4] batman-adv: Start new development cycle Simon Wunderlich
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
2020-06-30 8:27 [PATCH 0/4] pull request for net-next: batman-adv 2020-06-26 Simon Wunderlich
2020-06-30 8:27 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
2019-08-08 13:06 [PATCH 0/4] pull request for net-next: batman-adv 2019-08-08 Simon Wunderlich
2019-08-08 13:06 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
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 read-only IMAP folder(s) and NNTP newsgroup(s).