From: Daniel Weismüller <daniel.weismueller@ipfire.org>
Date: Fri, 20 Nov 2020 17:35:52 +0000 (+0100)
Subject: network-hotplug-bridges: Apply STP_PRIORITY
X-Git-Tag: v2.25-core155~384^2~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82973fae144d199c10332a174848db6eaddc1355;p=ipfire-2.x.git

network-hotplug-bridges: Apply STP_PRIORITY

Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/udev/network-hotplug-bridges b/config/udev/network-hotplug-bridges
index 7431377bbe..89470fec00 100644
--- a/config/udev/network-hotplug-bridges
+++ b/config/udev/network-hotplug-bridges
@@ -82,16 +82,22 @@ MODE="$(get_value "${ZONE}_MODE")"
 # The name of the virtual bridge
 BRIDGE="$(get_value "${ZONE}_DEV")"
 STP="$(get_value "${ZONE}_STP")"
+STP_PRIORITY="$(get_value "${ZONE}_STP_PRIORITY")"
 
 case "${MODE}" in
 	bridge)
+		# We need to check if $STP_PRIORITY has a valid value if not set it
+		if [ -n "${STP_PRIORITY}" ]; then
+			STP_PRIORITY=16384;
+		fi
+
 		ADDRESS="$(get_value "${ZONE}_MACADDR")"
 		[ -n "${ADDRESS}" ] || ADDRESS="$(random_mac_address)"
 
 		# We need to create the bridge if it doesn't exist, yet
 		if [ ! -d "/sys/class/net/${BRIDGE}" ]; then
 			ip link add "${BRIDGE}" address "${ADDRESS}" type bridge \
-				$([ "${STP}" = "on" ] && echo "stp_state 1")
+				$([ "${STP}" = "on" ] && echo "stp_state 1  priority ${STP_PRIORITY}" )
 			#ip link set "${BRIDGE}" up
 		fi