Remove support for Rapid Spanning Tree Protocol

[people/ms/network.git] / src / hooks / zones / bridge

diff --git a/src/hooks/zones/bridge b/src/hooks/zones/bridge
index 7b4e7a4e6e0aeb557c20f51f10a6df192cb1adab..e0d839b3d757e799c15e49b2a9f2e383672b94e6 100644 (file)
--- a/src/hooks/zones/bridge
+++ b/src/hooks/zones/bridge
@@ -23,16 +23,15 @@
 
 HOOK_MANPAGE="network-zone-bridge"
 
-HOOK_SETTINGS="HOOK STP STP_FORWARD_DELAY STP_HELLO STP_MAXAGE STP_MODE"
+HOOK_SETTINGS="HOOK STP STP_FORWARD_DELAY STP_HELLO STP_MAXAGE"
 HOOK_SETTINGS="${HOOK_SETTINGS} STP_PRIORITY MAC MTU"
 
 HOOK_PORT_SETTINGS="COST PRIORITY"
 
 # Default values
-MAC=$(mac_generate)
+MAC=""
 MTU=1500
 STP="on"
-STP_MODE="rstp"
 STP_FORWARD_DELAY=0
 STP_HELLO=2
 STP_MAXAGE=20
@@ -41,7 +40,6 @@ STP_PRIORITY=512
 hook_check_settings() {
        assert ismac MAC
        assert isbool STP
-       assert isoneof STP_MODE stp rstp
        assert isinteger STP_HELLO
        assert isinteger STP_FORWARD_DELAY
        assert isinteger STP_PRIORITY
@@ -54,9 +52,6 @@ hook_parse_cmdline() {
                        --stp=*)
                                STP=${1#--stp=}
                                ;;
-                       --stp-mode=*)
-                               STP_MODE=${1#--stp-mode=}
-                               ;;
                        --stp-hello=*)
                                STP_HELLO=${1#--stp-hello=}
                                ;;
@@ -78,6 +73,9 @@ hook_parse_cmdline() {
                esac
                shift
        done
+
+       # Generate a random MAC address if the user passed no one
+       isset MAC || MAC="$(mac_generate)"
 }
 
 hook_up() {
@@ -200,9 +198,6 @@ hook_status() {
 
        cli_headline 2 "Spanning Tree Protocol information"
        if stp_is_enabled "${zone}"; then
-               local proto=$(stp_bridge_get_protocol ${zone})
-
-               cli_print_fmt1 2 "Version"      "$(stp_get_name ${proto})"
                cli_print_fmt1 2 "ID"           "$(stp_bridge_get_id ${zone})"
                cli_print_fmt1 2 "Priority"     "$(stp_bridge_get_priority ${zone})"