about summary refs log tree commit diff
path: root/docs/api/html/nm-settings.html
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2019-04-21 21:09:51 +0200
committerMichael Biebl <biebl@debian.org>2019-04-21 21:09:51 +0200
commit85563b7fc7ec2cd21e38debb9b28db342e2e8e7c (patch)
treecce7b0b02d28fae2df9fdf2c1804cacd1500f2d7 /docs/api/html/nm-settings.html
parent9a6dcbf895f9da01768e64b73cec88c16157d91e (diff)
New upstream version 1.18.0 upstream/1.18.0
Diffstat (limited to 'docs/api/html/nm-settings.html')
-rw-r--r--docs/api/html/nm-settings.html28
1 files changed, 28 insertions, 0 deletions
diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html
index 57ffab77..6ee39655 100644
--- a/docs/api/html/nm-settings.html
+++ b/docs/api/html/nm-settings.html
@@ -857,6 +857,27 @@
 <td align="left">TRUE</td>
 <td>Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.</td>
 </tr>
+<tr>
+<td align="left">
+<a name="nm-settings.property.bridge.vlan-default-pvid"></a>vlan-default-pvid</td>
+<td align="left">uint32</td>
+<td align="left">1</td>
+<td>The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames.</td>
+</tr>
+<tr>
+<td align="left">
+<a name="nm-settings.property.bridge.vlan-filtering"></a>vlan-filtering</td>
+<td align="left">boolean</td>
+<td align="left">FALSE</td>
+<td>Control whether VLAN filtering is enabled on the bridge.</td>
+</tr>
+<tr>
+<td align="left">
+<a name="nm-settings.property.bridge.vlans"></a>vlans</td>
+<td align="left">array of vardict</td>
+<td align="left">[]</td>
+<td>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.</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -899,6 +920,13 @@
 <td align="left">32</td>
 <td>The Spanning Tree Protocol (STP) priority of this bridge port.</td>
 </tr>
+<tr>
+<td align="left">
+<a name="nm-settings.property.bridge-port.vlans"></a>vlans</td>
+<td align="left">array of vardict</td>
+<td align="left">[]</td>
+<td>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.</td>
+</tr>
 </tbody>
 </table></div>
 </div>