From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 23 Sep 2012 19:43:15 +0000 (+0000)
Subject: stp: Correctly set protocol version.
X-Git-Tag: 005~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=064655d58f903a3bb77091b7cfe4860a0a44d520;p=network.git

stp: Correctly set protocol version.
---

diff --git a/functions.stp b/functions.stp
index a23d15fb..433fb34c 100644
--- a/functions.stp
+++ b/functions.stp
@@ -107,7 +107,7 @@ function stp_bridge_set_protocol() {
 		mode="${STP_DEFAULT_MODE}"
 	fi
 
-	mstpctl setforcevers ${bridge} ${mode}
+	cmd mstpctl setforcevers ${bridge} ${mode}
 	assert [ $? -eq 0 ]
 }
 
diff --git a/helpers/bridge-stp b/helpers/bridge-stp
index fb8240f9..186f287a 100755
--- a/helpers/bridge-stp
+++ b/helpers/bridge-stp
@@ -59,6 +59,13 @@ case "${STP_MODE}" in
 			fi
 		fi
 
+		# Set the right protocol that should be used.
+		# Do this after the bridge has been added.
+		(
+			sleep 2
+			stp_bridge_set_protocol ${bridge} ${STP_MODE}
+		) &
+
 		# Tell mstpd that STP has to be enabled/disabled.
 		case "${action}" in
 			start)