From 786e3dec012b0e61404db201918d2345ef977c44 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 22 Apr 2024 10:59:19 +0200 Subject: [PATCH] bridger: update to Git HEAD (2024-04-22) ec8c620fd5f4 split bridge-local disable into rx and tx 40b1c5b6be4e flow: do not attempt to offload bridge-local flows Signed-off-by: Felix Fietkau --- package/network/services/bridger/Makefile | 6 +++--- package/network/services/bridger/files/bridger.conf | 3 ++- package/network/services/bridger/files/bridger.init | 7 +++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package/network/services/bridger/Makefile b/package/network/services/bridger/Makefile index b38c2ddbc51..d44e038967e 100644 --- a/package/network/services/bridger/Makefile +++ b/package/network/services/bridger/Makefile @@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bridger PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=https://github.com/nbd168/bridger -PKG_SOURCE_DATE:=2024-04-15 -PKG_SOURCE_VERSION:=a08e51e679dd7e1eaf70ea7fd6b6433e167d4c2d -PKG_MIRROR_HASH:=e80ac0cc3c5b27afb233c03fed3fbcef34a1b3fdbe0d48532ad1d5c3aac4088d +PKG_SOURCE_DATE:=2024-04-22 +PKG_SOURCE_VERSION:=40b1c5b6be4e73a6749cf2997c664520eb20055d +PKG_MIRROR_HASH:=b3ba2ab5ffa1af55f8da2cae5a90df486474b97ed4c359ec40c986aa6e82c300 PKG_LICENSE:=GPL-2.0 PKG_MAINTAINER:=Felix Fietkau diff --git a/package/network/services/bridger/files/bridger.conf b/package/network/services/bridger/files/bridger.conf index 2ff6b5b787a..bad8508f14a 100644 --- a/package/network/services/bridger/files/bridger.conf +++ b/package/network/services/bridger/files/bridger.conf @@ -1,6 +1,7 @@ config defaults # handle bridge local rx/tx - option bridge_local 0 + option bridge_local_tx 1 + option bridge_local_rx 0 # example for blacklisting individual devices or bridges # list blacklist eth0 diff --git a/package/network/services/bridger/files/bridger.init b/package/network/services/bridger/files/bridger.init index c9983ae9cc6..057b18a94f4 100644 --- a/package/network/services/bridger/files/bridger.init +++ b/package/network/services/bridger/files/bridger.init @@ -16,8 +16,11 @@ get_defaults() { done json_close_array - config_get_bool bridge_local "$cfg" bridge_local 0 - json_add_boolean bridge_local "$bridge_local" + config_get_bool bridge_local_tx "$cfg" bridge_local_tx 1 + json_add_boolean bridge_local_tx "$bridge_local_tx" + + config_get_bool bridge_local_rx "$cfg" bridge_local_rx 0 + json_add_boolean bridge_local_rx "$bridge_local_rx" } reload_service() {