* [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
` (3 more replies)
0 siblings, 4 replies; 6+ 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] 6+ messages in thread* [PATCH 1/4] batman-adv: Start new development cycle
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 ` Simon Wunderlich
2022-09-20 1:20 ` patchwork-bot+netdevbpf
2022-09-16 16:14 ` [PATCH 2/4] batman-adv: Drop unused headers in trace.h Simon Wunderlich
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ 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
This version will contain all the (major or even only minor) changes for
Linux 6.1.
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 23f3d53f4b51..c48803b32bb0 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -13,7 +13,7 @@
#define BATADV_DRIVER_DEVICE "batman-adv"
#ifndef BATADV_SOURCE_VERSION
-#define BATADV_SOURCE_VERSION "2022.2"
+#define BATADV_SOURCE_VERSION "2022.3"
#endif
/* B.A.T.M.A.N. parameters */
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] batman-adv: Drop unused headers in trace.h
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-16 16:14 ` Simon Wunderlich
2022-09-16 16:14 ` [PATCH 3/4] batman-adv: Drop initialization of flexible ethtool_link_ksettings Simon Wunderlich
2022-09-16 16:14 ` [PATCH 4/4] batman-adv: remove unused struct definitions Simon Wunderlich
3 siblings, 0 replies; 6+ 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, Sven Eckelmann, Simon Wunderlich
From: Sven Eckelmann <sven@narfation.org>
The commit 9abc291812d7 ("batman-adv: tracing: Use the new __vstring()
helper") removed the usage of WARN_ON_ONCE and __dynamic_array in this
file. But it was forgotten to adjust the headers accordingly (dropping the
now no longer used ones).
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
net/batman-adv/trace.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h
index 31c8f922651d..5dd52bc5cabb 100644
--- a/net/batman-adv/trace.h
+++ b/net/batman-adv/trace.h
@@ -9,8 +9,6 @@
#include "main.h"
-#include <linux/bug.h>
-#include <linux/kernel.h>
#include <linux/netdevice.h>
#include <linux/percpu.h>
#include <linux/printk.h>
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] batman-adv: Drop initialization of flexible ethtool_link_ksettings
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-16 16:14 ` [PATCH 2/4] batman-adv: Drop unused headers in trace.h Simon Wunderlich
@ 2022-09-16 16:14 ` Simon Wunderlich
2022-09-16 16:14 ` [PATCH 4/4] batman-adv: remove unused struct definitions Simon Wunderlich
3 siblings, 0 replies; 6+ 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, Sven Eckelmann, Simon Wunderlich
From: Sven Eckelmann <sven@narfation.org>
The commit 94dfc73e7cf4 ("treewide: uapi: Replace zero-length arrays with
flexible-array members") changed various structures from using 0-length
arrays to flexible arrays
net/batman-adv/bat_v_elp.c: note: in included file:
./include/linux/ethtool.h:148:38: warning: nested flexible array
net/batman-adv/bat_v_elp.c:128:9: warning: using sizeof on a flexible structure
In theory, this could be worked around by using {} as initializer for the
variable on the stack. But this variable doesn't has to be initialized at
all by the caller of __ethtool_get_link_ksettings - everything will be
initialized by the callee when no error occurs.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
net/batman-adv/bat_v_elp.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index b6db999abf75..f1741fbfb617 100644
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
@@ -125,7 +125,6 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
/* if not a wifi interface, check if this device provides data via
* ethtool (e.g. an Ethernet adapter)
*/
- memset(&link_settings, 0, sizeof(link_settings));
rtnl_lock();
ret = __ethtool_get_link_ksettings(hard_iface->net_dev, &link_settings);
rtnl_unlock();
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] batman-adv: remove unused struct definitions
2022-09-16 16:14 [PATCH 0/4] pull request for net-next: batman-adv 2022-09-16 Simon Wunderlich
` (2 preceding siblings ...)
2022-09-16 16:14 ` [PATCH 3/4] batman-adv: Drop initialization of flexible ethtool_link_ksettings Simon Wunderlich
@ 2022-09-16 16:14 ` Simon Wunderlich
3 siblings, 0 replies; 6+ 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, Marek Lindner, Sven Eckelmann, Simon Wunderlich
From: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
net/batman-adv/types.h | 39 ---------------------------------------
1 file changed, 39 deletions(-)
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index 2be5d4a712c5..758cd797a063 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -1740,45 +1740,6 @@ struct batadv_priv {
#endif
};
-/**
- * struct batadv_socket_client - layer2 icmp socket client data
- */
-struct batadv_socket_client {
- /**
- * @queue_list: packet queue for packets destined for this socket client
- */
- struct list_head queue_list;
-
- /** @queue_len: number of packets in the packet queue (queue_list) */
- unsigned int queue_len;
-
- /** @index: socket client's index in the batadv_socket_client_hash */
- unsigned char index;
-
- /** @lock: lock protecting queue_list, queue_len & index */
- spinlock_t lock;
-
- /** @queue_wait: socket client's wait queue */
- wait_queue_head_t queue_wait;
-
- /** @bat_priv: pointer to soft_iface this client belongs to */
- struct batadv_priv *bat_priv;
-};
-
-/**
- * struct batadv_socket_packet - layer2 icmp packet for socket client
- */
-struct batadv_socket_packet {
- /** @list: list node for &batadv_socket_client.queue_list */
- struct list_head list;
-
- /** @icmp_len: size of the layer2 icmp packet */
- size_t icmp_len;
-
- /** @icmp_packet: layer2 icmp packet */
- u8 icmp_packet[BATADV_ICMP_MAX_PACKET_SIZE];
-};
-
#ifdef CONFIG_BATMAN_ADV_BLA
/**
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-09-20 1:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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-09-16 16:14 ` [PATCH 2/4] batman-adv: Drop unused headers in trace.h Simon Wunderlich
2022-09-16 16:14 ` [PATCH 3/4] batman-adv: Drop initialization of flexible ethtool_link_ksettings Simon Wunderlich
2022-09-16 16:14 ` [PATCH 4/4] batman-adv: remove unused struct definitions 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 NNTP newsgroup(s).