batman-adv: update to version 2026.3

From upstream changelog
https://git.open-mesh.org/batman-adv.git/tree/CHANGELOG.rst:

* support latest kernels (5.15 - 7.3)
* coding style cleanups and refactoring
* reduce memory and runtime overhead by only handling attached interfaces
* optimize throughput meters unacked packets handling
* bugs squashed:
  - clean untagged VLAN on netdev registration failure
  - ensure minimal ethernet header on TX
  - fix VLAN priority offset
  - bla: avoid CRC corruption due to parallel claim add
  - bla: fix freeing of claims on meshif deletion
  - bla: prevent CRC corruptions after claim flush
  - dat: atomically update mac addresses
  - dat: avoid unaligned fault in IP extraction
  - dat: fix tie-break for candidate selection
  - frag: fix primary_if leak on failed linearization
  - frag: fix stale receive device on merged fragments
  - frag: free unfragmentable packet
  - mcast: avoid OOB read of num_dests header
  - mcast: fix TX priority extraction for BATADV_FORW_MCAST
  - mcast: ensure unshared skb for multicast packets
  - mcast: linearize skbuff for packet generation
  - mcast: reject unrepresentable TVLV offsets
  - tt: avoid request storms during pending request
  - tt: prevent TVLV OOB check overflow
  - tvlv: handle negative tvlv processing return codes

Signed-off-by: Sven Eckelmann <redacted>

diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile
index 1e5178877a13c9d022c1f36a8addf5c703d1a83f..c316cb809ed9ebfc334b5fa1d057223827825114 100644 (file)
--- a/net/batman-adv/Makefile
+++ b/net/batman-adv/Makefile
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
-PKG_VERSION:=2026.2
+PKG_VERSION:=2026.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
-PKG_HASH:=4e17fced2c80945e22609be87534481733ff1b5d17050de4e4f323c171418135
+PKG_HASH:=c3524e7d8f148786a052654a7b1090e394746d3a71ee5d657f986dd7af161762
 PKG_EXTMOD_SUBDIRS:=net/batman-adv
 
 PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>

diff --git a/net/batman-adv/patches/0001-fix-batadv_is_cfg80211_netdev.patch b/net/batman-adv/patches/0001-fix-batadv_is_cfg80211_netdev.patch
index 12914d98fa7edc2c64e5c75fd568adcb60bc71c7..62ca535641460bbcf5d9509d132b9afe03a97283 100644 (file)
--- a/net/batman-adv/patches/0001-fix-batadv_is_cfg80211_netdev.patch
+++ b/net/batman-adv/patches/0001-fix-batadv_is_cfg80211_netdev.patch
@@ -8,7 +8,7 @@ macro to use when building under backports.
 
 --- a/net/batman-adv/hard-interface.c
 +++ b/net/batman-adv/hard-interface.c
-@@ -320,8 +320,7 @@ static bool batadv_is_cfg80211_netdev(st
+@@ -332,8 +332,7 @@ static bool batadv_is_cfg80211_netdev(st
  {
        if (!net_device)
                return false;

diff --git a/net/batman-adv/src/compat-hacks.h b/net/batman-adv/src/compat-hacks.h
index 43cce807913775195b07f50f9627337e3cd8f287..5ab009e0ecf58cb72db32b5510f6ef8d7c0dcd85 100644 (file)
--- a/net/batman-adv/src/compat-hacks.h
+++ b/net/batman-adv/src/compat-hacks.h
@@ -67,6 +67,44 @@ static inline u32 batadv_skb_crc32c(struct sk_buff *skb, int offset,
 
 #endif /* < KERNEL_VERSION(7, 0, 0) */
 
+#if LINUX_VERSION_IS_LESS(7, 3, 0)
+
+#include <linux/skbuff.h>
+
+static inline bool __must_check
+batadv_skb_set_transport_header_careful(struct sk_buff *skb, const int offset)
+{
+       long thoff = skb->data - skb->head + offset;
+
+       if (unlikely(thoff != (typeof(skb->transport_header))thoff))
+               return false;
+
+       if (unlikely(thoff == (typeof(skb->transport_header))~0U))
+               return false;
+
+       skb->transport_header = thoff;
+       return true;
+}
+
+#define skb_set_transport_header_careful batadv_skb_set_transport_header_careful
+
+#endif /* LINUX_VERSION_IS_LESS(7, 3, 0) */
+
+/* <VERSION> */
+
+#include <linux/utsname.h>
+
+#define init_utsname() batadv_init_utsname()
+
+extern struct new_utsname batadv_version_name;
+
+static inline struct new_utsname *batadv_init_utsname(void)
+{
+       return &batadv_version_name;
+}
+
+/* </VERSION> */
+
 /* <DECLARE_EWMA> */
 
 #include <linux/version.h>