New upstream version 1.18.0 upstream/1.18.0

1 files changed, 4 insertions, 0 deletions

diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index 2a73f041..4b4406aa 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -117,6 +117,9 @@
     <row><entry><screen>multicast-snooping<indexterm zone="settings-bridge"><primary sortas="multicast-snooping">multicast-snooping</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>TRUE</screen></entry><entry>Controls whether IGMP snooping is enabled for this bridge. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved.</entry></row>
     <row><entry><screen>priority<indexterm zone="settings-bridge"><primary sortas="priority">priority</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>32768</screen></entry><entry>Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are "better"; the lowest priority bridge will be elected the root bridge.</entry></row>
     <row><entry><screen>stp<indexterm zone="settings-bridge"><primary sortas="stp">stp</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>TRUE</screen></entry><entry>Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.</entry></row>
+    <row><entry><screen>vlan-default-pvid<indexterm zone="settings-bridge"><primary sortas="vlan-default-pvid">vlan-default-pvid</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>1</screen></entry><entry>The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames.</entry></row>
+    <row><entry><screen>vlan-filtering<indexterm zone="settings-bridge"><primary sortas="vlan-filtering">vlan-filtering</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry>Control whether VLAN filtering is enabled on the bridge.</entry></row>
+    <row><entry><screen>vlans<indexterm zone="settings-bridge"><primary sortas="vlans">vlans</primary></indexterm></screen></entry><entry><screen>array of vardict</screen></entry><entry><screen>[]</screen></entry><entry>Array of bridge VLAN objects. In addition to the VLANs specified here, the bridge will also have the default-pvid VLAN configured  by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash.</entry></row>
   </tbody></tgroup></table></para></refsect1></refentry>
   <refentry id="settings-bridge-port"><refnamediv><refname>bridge-port</refname><refpurpose>Bridge Port Settings</refpurpose></refnamediv><refsect1 role="properties"><title id="settings-bridge-port.properties">
             Properties
@@ -124,6 +127,7 @@
     <row><entry><screen>hairpin-mode<indexterm zone="settings-bridge-port"><primary sortas="hairpin-mode">hairpin-mode</primary></indexterm></screen></entry><entry><screen>boolean</screen></entry><entry><screen>FALSE</screen></entry><entry>Enables or disables "hairpin mode" for the port, which allows frames to be sent back out through the port the frame was received on.</entry></row>
     <row><entry><screen>path-cost<indexterm zone="settings-bridge-port"><primary sortas="path-cost">path-cost</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>100</screen></entry><entry>The Spanning Tree Protocol (STP) port cost for destinations via this port.</entry></row>
     <row><entry><screen>priority<indexterm zone="settings-bridge-port"><primary sortas="priority">priority</primary></indexterm></screen></entry><entry><screen>uint32</screen></entry><entry><screen>32</screen></entry><entry>The Spanning Tree Protocol (STP) priority of this bridge port.</entry></row>
+    <row><entry><screen>vlans<indexterm zone="settings-bridge-port"><primary sortas="vlans">vlans</primary></indexterm></screen></entry><entry><screen>array of vardict</screen></entry><entry><screen>[]</screen></entry><entry>Array of bridge VLAN objects. In addition to the VLANs specified here, the port will also have the default-pvid VLAN configured on the bridge by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash.</entry></row>
   </tbody></tgroup></table></para></refsect1></refentry>
   <refentry id="settings-cdma"><refnamediv><refname>cdma</refname><refpurpose>CDMA-based Mobile Broadband Settings</refpurpose></refnamediv><refsect1 role="properties"><title id="settings-cdma.properties">
             Properties