From 98898659ce9d1536567ed2417ad4d2ee6baa464e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Fri, 22 Oct 2021 18:08:35 +0200 Subject: [PATCH] fff-network: Add temporary workaround for dsa bridge configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the bridge created for DSA devices is configured without any members, a single netifd reload is currently not sufficient to correctly apply network settings. This is due to a bug in netifd (FS#4104). Temporarily add a simple workaround by always configuring the bridge, even if it does not have any member ports. Signed-off-by: Fabian Bläse Reviewed-by: Johannes Kimmel --- src/packages/fff/fff-network/Makefile | 2 +- src/packages/fff/fff-network/files/usr/sbin/configurenetwork | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile index 81b4ba16..66575b49 100644 --- a/src/packages/fff/fff-network/Makefile +++ b/src/packages/fff/fff-network/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-network -PKG_RELEASE:=48 +PKG_RELEASE:=49 include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork index 56d377ae..c9ab7b87 100755 --- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork +++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork @@ -117,6 +117,8 @@ else uci set network.$SWITCHDEV=device uci set network.$SWITCHDEV.name=$SWITCHDEV uci set network.$SWITCHDEV.type=bridge + # temporary workaround for netifd bug present in OpenWrt 21.02.0 (FS#4104) + uci set network.$SWITCHDEV.bridge_empty='1' uci set network.${SWITCHDEV}_1=bridge-vlan uci set network.${SWITCHDEV}_1.device=$SWITCHDEV