diff options
| author | Michael Biebl <biebl@debian.org> | 2019-04-21 21:09:51 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-04-21 21:09:51 +0200 |
| commit | 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c (patch) | |
| tree | cce7b0b02d28fae2df9fdf2c1804cacd1500f2d7 /libnm/nm-settings-ifcfg-rh-docs.xml | |
| parent | 9a6dcbf895f9da01768e64b73cec88c16157d91e (diff) | |
New upstream version 1.18.0 upstream/1.18.0
Diffstat (limited to 'libnm/nm-settings-ifcfg-rh-docs.xml')
| -rw-r--r-- | libnm/nm-settings-ifcfg-rh-docs.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libnm/nm-settings-ifcfg-rh-docs.xml b/libnm/nm-settings-ifcfg-rh-docs.xml index cec2d527..ca5a8449 100644 --- a/libnm/nm-settings-ifcfg-rh-docs.xml +++ b/libnm/nm-settings-ifcfg-rh-docs.xml @@ -58,6 +58,7 @@ lookaside file, or it can be owned by a secret agent."/> <property name="priority" variable="BRIDGING_OPTS: priority=" format="" values="0 - 63" default="32" example="" description="STP priority."/> <property name="path-cost" variable="BRIDGING_OPTS: path_cost=" format="" values="1 - 65535" default="100" example="" description="STP cost."/> <property name="hairpin-mode" variable="BRIDGING_OPTS: hairpin_mode=" format="" values="" default="yes" example="" description="Hairpin mode of the bridge port."/> +<property name="vlans" variable="BRIDGE_PORT_VLANS" format="" values="" default="" example="BRIDGE_PORT_VLANS="1 pvid untagged,20,300-400 untagged"" description="List of VLANs on the bridge port"/> </setting> <setting name="bridge"> <property name="mac-address" variable="BRIDGE_MACADDR(+)" format="" values="" default="" example="" description="MAC address of the bridge. Note that this requires a recent @@ -70,6 +71,9 @@ BRIDGE_MACADDR for bridges is an NM extension."/> <property name="max-age" variable="BRIDGING_OPTS: max_age=" format="" values="6 - 40" default="20" example="" description="STP maximum message age."/> <property name="ageing-time" variable="BRIDGING_OPTS: ageing_time=" format="" values="0 - 1000000" default="300" example="" description="Ethernet MAC ageing time."/> <property name="multicast-snooping" variable="BRIDGING_OPTS: multicast_snooping=" format="" values="0 or 1" default="1" example="" description="IGMP snooping support."/> +<property name="vlan-filtering" variable="BRIDGING_OPTS: vlan_filtering=" format="" values="0 or 1" default="0" example="" description="VLAN filtering support."/> +<property name="vlan-default-pvid" variable="BRIDGING_OPTS: default_pvid=" format="" values="0 - 4094" default="1" example="" description="default VLAN PVID."/> +<property name="vlans" variable="BRIDGE_VLANS" format="" values="" default="" example="BRIDGE_VLANS="1 pvid untagged,20,300-400 untagged"" description="List of VLANs on the bridge"/> </setting> <setting name="cdma"> </setting> |