From 4a1cff317d952d79dfcc951e0e4e5c4a096e765b Mon Sep 17 00:00:00 2001 From: Simon Wunderlich Date: Wed, 9 Apr 2025 10:03:38 +0200 Subject: [PATCH 1/5] batman-adv: Start new development cycle This version will contain all the (major or even only minor) changes for Linux 6.16. 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 --- 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 67af435ee04e..4b5ce8972848 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 "2025.1" +#define BATADV_SOURCE_VERSION "2025.2" #endif /* B.A.T.M.A.N. parameters */ From d699628dae07038cf21fe288ac00c0a0062b4e0d Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 8 Apr 2025 17:53:36 +0200 Subject: [PATCH 2/5] batman-adv: constify and move broadcast addr definition The variable is used only once and is read-only. Make it a const local variable. Signed-off-by: Matthias Schiffer Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich --- net/batman-adv/main.c | 2 -- net/batman-adv/main.h | 1 - net/batman-adv/send.c | 4 +++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index a08132888a3d..e41f816f0887 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -69,8 +69,6 @@ unsigned int batadv_hardif_generation; static int (*batadv_rx_handler[256])(struct sk_buff *skb, struct batadv_hard_iface *recv_if); -unsigned char batadv_broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - struct workqueue_struct *batadv_event_workqueue; static void batadv_recv_handler_init(void); diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 4b5ce8972848..692109be2210 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -235,7 +235,6 @@ static inline int batadv_print_vid(unsigned short vid) extern struct list_head batadv_hardif_list; extern unsigned int batadv_hardif_generation; -extern unsigned char batadv_broadcast_addr[]; extern struct workqueue_struct *batadv_event_workqueue; int batadv_mesh_init(struct net_device *mesh_iface); diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 735ac8077821..9d72f4f15b3d 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -124,7 +124,9 @@ send_skb_err: int batadv_send_broadcast_skb(struct sk_buff *skb, struct batadv_hard_iface *hard_iface) { - return batadv_send_skb_packet(skb, hard_iface, batadv_broadcast_addr); + static const u8 broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; + + return batadv_send_skb_packet(skb, hard_iface, broadcast_addr); } /** From 8a7bb74a79d4324bf09e78f5a941521dea83a24f Mon Sep 17 00:00:00 2001 From: Antonio Quartulli Date: Mon, 17 Mar 2025 13:39:59 +0100 Subject: [PATCH 3/5] batman-adv: no need to start/stop queue on mesh-iface The batman-adv mesh-iface is flagged with IFF_NO_QUEUE, therefore there is no reason to start/stop any queue in ndo_open/close. Signed-off-by: Antonio Quartulli Signed-off-by: Simon Wunderlich --- net/batman-adv/mesh-interface.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/net/batman-adv/mesh-interface.c b/net/batman-adv/mesh-interface.c index 59e7b5aacbc9..e48b683a033f 100644 --- a/net/batman-adv/mesh-interface.c +++ b/net/batman-adv/mesh-interface.c @@ -77,18 +77,6 @@ int batadv_skb_head_push(struct sk_buff *skb, unsigned int len) return 0; } -static int batadv_interface_open(struct net_device *dev) -{ - netif_start_queue(dev); - return 0; -} - -static int batadv_interface_release(struct net_device *dev) -{ - netif_stop_queue(dev); - return 0; -} - /** * batadv_sum_counter() - Sum the cpu-local counters for index 'idx' * @bat_priv: the bat priv with all the mesh interface information @@ -890,8 +878,6 @@ out: static const struct net_device_ops batadv_netdev_ops = { .ndo_init = batadv_meshif_init_late, - .ndo_open = batadv_interface_open, - .ndo_stop = batadv_interface_release, .ndo_get_stats = batadv_interface_stats, .ndo_vlan_rx_add_vid = batadv_interface_add_vid, .ndo_vlan_rx_kill_vid = batadv_interface_kill_vid, From a608f11d3a3b9464bd6ec63b7e3e84cccd556e06 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Sun, 13 Apr 2025 10:14:42 +0200 Subject: [PATCH 4/5] batman-adv: Switch to crc32 header for crc32c The crc32c() function was moved in commit 8df36829045a ("lib/crc32: standardize on crc32c() name for Castagnoli CRC32") from linux/crc32c.h to linux/crc32.h. The former is just an include file which redirects to the latter. Avoid the indirection by directly including the correct header file. Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich --- net/batman-adv/main.c | 2 +- net/batman-adv/translation-table.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index e41f816f0887..c0bc75513355 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 4a3165920de1..8d0e04e770cb 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include From 4e1ccc8e52e5eb3a072d7e4faecd80c6f326bfd2 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Sun, 13 Apr 2025 11:09:03 +0200 Subject: [PATCH 5/5] batman-adv: Drop unused net_namespace.h include Since commit 69c7be1b903f ("rtnetlink: Pack newlink() params into struct"), .newlink() doesn't use the struct net parameter. A type definition from net_namespace.h is no longer needed. Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich --- net/batman-adv/mesh-interface.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/batman-adv/mesh-interface.c b/net/batman-adv/mesh-interface.c index e48b683a033f..5bbc366f974d 100644 --- a/net/batman-adv/mesh-interface.c +++ b/net/batman-adv/mesh-interface.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include