batman-adv: update to version 2025.4

* support latest kernels (5.4 - 6.18)
* removed network coding (C.A.T.W.O.M.A.N.) support
* coding style cleanups and refactoring
* bugs squashed:
  - release references to inactive interfaces on netlink queries

Signed-off-by: Sven Eckelmann <[email protected]>

diff --git a/batman-adv/Config.in b/batman-adv/Config.in
index 81163366012acf57be24854496f6217cf78e33d4..9da3b8ab4361bb869f13c8a6edf8970f85d5c750 100644 (file)
--- a/batman-adv/Config.in
+++ b/batman-adv/Config.in
@@ -43,19 +43,6 @@ config BATMAN_ADV_DAT
          mesh networks. If you think that your network does not need
          this option you can safely remove it and save some space.
 
-config BATMAN_ADV_NC
-       bool "Network Coding"
-       depends on PACKAGE_kmod-batman-adv
-       help
-         This option enables network coding, a mechanism that aims to
-         increase the overall network throughput by fusing multiple
-         packets in one transmission.
-         Note that interfaces controlled by batman-adv must be manually
-         configured to have promiscuous mode enabled in order to make
-         network coding work.
-         If you think that your network does not need this feature you
-         can safely disable it and save some space.
-
 config BATMAN_ADV_MCAST
        bool "Multicast optimisation"
        depends on PACKAGE_kmod-batman-adv

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 99900a0527bda6a9fd3a00b6e9a47b18d5c98cb9..394f1e13401a4745b262a813d516955d847fede5 100644 (file)
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
-PKG_VERSION:=2025.3
+PKG_VERSION:=2025.4
 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:=be0823a0936bf59e2af2d115a7e26317f8220b998f4833257465af2b6ffe1ce8
+PKG_HASH:=62490a8f8b58c02e819216f3e963249984645d3e460156a043b73fc53e24f86d
 PKG_EXTMOD_SUBDIRS:=net/batman-adv
 
 PKG_MAINTAINER:=Simon Wunderlich <[email protected]>
@@ -23,7 +23,6 @@ PKG_CONFIG_DEPENDS += \
        CONFIG_BATMAN_ADV_BATMAN_V \
        CONFIG_BATMAN_ADV_BLA \
        CONFIG_BATMAN_ADV_DAT \
-       CONFIG_BATMAN_ADV_NC \
        CONFIG_BATMAN_ADV_MCAST \
        CONFIG_BATMAN_ADV_DEBUG \
        CONFIG_BATMAN_ADV_TRACING
@@ -63,7 +62,6 @@ PKG_EXTRA_KCONFIG:= \
        CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_BATMAN_ADV_BLA),y,n) \
        CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_BATMAN_ADV_DAT),y,n) \
        CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_BATMAN_ADV_MCAST),y,n) \
-       CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_BATMAN_ADV_NC),y,n) \
        CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_BATMAN_ADV_BATMAN_V),y,n) \
        CONFIG_BATMAN_ADV_TRACING=$(if $(CONFIG_BATMAN_ADV_TRACING),y,n) \
 

diff --git a/batman-adv/files/etc/uci-defaults/99-migrate-batadv_hardif b/batman-adv/files/etc/uci-defaults/99-migrate-batadv_hardif
index 258b7bd6a58892fd02e257c4679dc46dbcf7adf7..c74b7f9c62e58a12459eacd438adcdf5486980fa 100755 (executable)
--- a/batman-adv/files/etc/uci-defaults/99-migrate-batadv_hardif
+++ b/batman-adv/files/etc/uci-defaults/99-migrate-batadv_hardif
@@ -45,7 +45,6 @@ mv_batadv_config_section() {
     local isolation_mark
     local log_level
     local multicast_mode
-    local network_coding
     local orig_interval
 
     config_get aggregated_ogms "${section}" aggregated_ogms
@@ -61,7 +60,6 @@ mv_batadv_config_section() {
     config_get isolation_mark "${section}" isolation_mark
     config_get log_level "${section}" log_level
     config_get multicast_mode "${section}" multicast_mode
-    config_get network_coding "${section}" network_coding
     config_get orig_interval "${section}" orig_interval
 
     # update section in case it exists
@@ -78,7 +76,6 @@ mv_batadv_config_section() {
     [ -n "${isolation_mark}" ]  && uci set network."${section}".isolation_mark="${isolation_mark}"
     [ -n "${log_level}" ]  && uci set network."${section}".log_level="${log_level}"
     [ -n "${multicast_mode}" ]  && uci set network."${section}".multicast_mode="${multicast_mode}"
-    [ -n "${network_coding}" ]  && uci set network."${section}".network_coding="${network_coding}"
     [ -n "${orig_interval}" ]  && uci set network."${section}".orig_interval="${orig_interval}"
 }
 

diff --git a/batman-adv/files/lib/netifd/proto/batadv.sh b/batman-adv/files/lib/netifd/proto/batadv.sh
index edc14f4cbd5485ede408e897fada8eae6f8f09d3..4ef490d3d7d838c29fa6284e02b1f31b21d8c220 100755 (executable)
--- a/batman-adv/files/lib/netifd/proto/batadv.sh
+++ b/batman-adv/files/lib/netifd/proto/batadv.sh
@@ -24,7 +24,6 @@ proto_batadv_init_config() {
        proto_config_add_string 'log_level'
        proto_config_add_int 'multicast_fanout'
        proto_config_add_boolean 'multicast_mode:bool'
-       proto_config_add_boolean 'network_coding:bool'
        proto_config_add_int 'orig_interval'
        proto_config_add_string 'routing_algo'
 }
@@ -47,7 +46,6 @@ proto_batadv_setup() {
        local log_level
        local multicast_fanout
        local multicast_mode
-       local network_coding
        local orig_interval
        local routing_algo
 
@@ -65,7 +63,6 @@ proto_batadv_setup() {
        json_get_vars log_level
        json_get_vars multicast_fanout
        json_get_vars multicast_mode
-       json_get_vars network_coding
        json_get_vars orig_interval
        json_get_vars routing_algo
 
@@ -105,7 +102,6 @@ proto_batadv_setup() {
        [ -n "$isolation_mark" ] && batctl meshif "$iface" isolation_mark "$isolation_mark"
        [ -n "$multicast_fanout" ] && batctl meshif "$iface" multicast_fanout "$multicast_fanout"
        [ -n "$multicast_mode" ] && batctl meshif "$iface" multicast_mode "$multicast_mode" 2>&-
-       [ -n "$network_coding" ] && batctl meshif "$iface" network_coding "$network_coding" 2>&-
        [ -n "$log_level" ] && batctl meshif "$iface" loglevel "$log_level" 2>&-
        [ -n "$orig_interval" ] && batctl meshif "$iface" orig_interval "$orig_interval"
 

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

diff --git a/batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch b/batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch
index bf3605cc787052ecc113b467ff5d442e39fcb570..cbc4042034ec9d388d58e3fdc81f91467252f81a 100644 (file)
--- a/batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch
+++ b/batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch
@@ -41,7 +41,7 @@ This reverts commit f33d7f724675544a36b24c77f8d4b95d41252ae2.
  #include <linux/atomic.h>
  #include <linux/build_bug.h>
  #include <linux/byteorder/generic.h>
-@@ -20,6 +19,7 @@
+@@ -19,6 +18,7 @@
  #include <linux/init.h>
  #include <linux/ip.h>
  #include <linux/ipv6.h>