stp: Correctly set protocol version.

diff --git a/functions.stp b/functions.stp
index a23d15fb80498e112d7c512943bc1900bef61be8..433fb34c8b888670531749d4092080d2029978d4 100644 (file)
--- 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 fb8240f9cd7144f94b2dcbcbd9537e838d0ea84e..186f287af99284fa49cbfc0ece0756c7a6e994f6 100755 (executable)
--- 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)