luci-0.8: merge r4719

diff --git a/modules/admin-core/root/lib/uci/schema/default/network b/modules/admin-core/root/lib/uci/schema/default/network
index 0ea439d..ee58b7a 100644 (file)
--- a/modules/admin-core/root/lib/uci/schema/default/network
+++ b/modules/admin-core/root/lib/uci/schema/default/network
@@ -339,6 +339,13 @@ config enum
        option variable 'network.interface.type'
        option value    'bridge'
        option title    'This is a bridge interface'
+       
+config variable
+       option name     'stp'
+       option title    'Enable STP'
+       option section  'network.interface.stp'
+       option datatype 'boolean'
+       option depends  'type=bridge'