openwrt-mirror/routing
1
0
Fork 0
mirror of https://github.com/openwrt/routing.git synced 2025-12-21 19:14:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1143 from ecsv/batadv-2025.4

Browse Source 
batman-adv: update packages to version 2025.4
This commit is contained in:
Simon Wunderlich
2025-10-26 10:44:37 +01:00
committed by GitHub
parent 45221cf5fa 43055942d1
commit 149ea45cc2
8 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
alfred/Makefile
View File

@@ -3,12 +3,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=alfred
PKG_VERSION:=2025.3
PKG_VERSION:=2025.4
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
PKG_HASH:=fb04c8db663a6e1d1dc9e46712fcabe82b73d0c0b47e40b4d1610002ef510975
PKG_HASH:=8375475478ed1cd4139c9000175a7d1407ee8dd919a0b7c9dbf7d15095880485
PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
PKG_LICENSE:=GPL-2.0-only MIT

6
batctl/Makefile
View File

@@ -3,12 +3,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=batctl
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:=70444b182c85d0c2714d914574124980801bb743d1626ee27a179fa22066fdc2
PKG_HASH:=566aa4fd74355e8d5dd2bd21c25e98cc068e77fd08e19f80b8e2b5edde7c8e65
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
@@ -111,7 +111,6 @@ config-n := \
multicast_mode \
neighbors \
neighbors_json \
network_coding \
orig_interval \
originators \
originators_json \
@@ -145,7 +144,6 @@ config-settings := \
multicast_fanout \
multicast_forceflood \
multicast_mode \
network_coding \
orig_interval \
routing_algo \
throughput_override \

13
batman-adv/Config.in
View File

@@ -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

6
batman-adv/Makefile
View File

@@ -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 <sw@simonwunderlich.de>
@@ -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) \

3
batman-adv/files/etc/uci-defaults/99-migrate-batadv_hardif
View File

@@ -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}"
}

4
batman-adv/files/lib/netifd/proto/batadv.sh
View File

@@ -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"

2
batman-adv/patches/0001-fix-batadv_is_cfg80211_netdev.patch
View File

@@ -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;

2
batman-adv/patches/0002-Revert-batman-adv-Switch-to-linux-array_size.h.patch
View File

@@ -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>