From 9a6dcbf895f9da01768e64b73cec88c16157d91e Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Tue, 26 Mar 2019 23:25:23 +0100
Subject: New upstream version 1.16.0

---
 libnm/nm-settings-ifcfg-rh-docs.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'libnm/nm-settings-ifcfg-rh-docs.xml')

diff --git a/libnm/nm-settings-ifcfg-rh-docs.xml b/libnm/nm-settings-ifcfg-rh-docs.xml
index 11f3115d..cec2d527 100644
--- a/libnm/nm-settings-ifcfg-rh-docs.xml
+++ b/libnm/nm-settings-ifcfg-rh-docs.xml
@@ -135,7 +135,7 @@ means &quot;do not transmit priority pause&quot;, &quot;1&quot; means &quot;tran
 The sum of the numbers must be 100."/>
 <property name="priority-strict-bandwidth" variable="DCB_PG_STRICT" format="" values="" default="" example="DCB_PG_STRICT=01101110" description="Priority values. String of eight &quot;0&quot; or &quot;1&quot;, where &quot;0&quot; means
 &quot;may not utilize all bandwidth&quot;, &quot;1&quot; means &quot;may utilize all bandwidth&quot;."/>
-<property name="priority-traffic-class" variable="DCB_PG_UP2TC" format="" values="" default="" example="DCB_PG_UP2TC=01623701" description="Priority values. String of eight trafic class values (0 - 7)."/>
+<property name="priority-traffic-class" variable="DCB_PG_UP2TC" format="" values="" default="" example="DCB_PG_UP2TC=01623701" description="Priority values. String of eight traffic class values (0 - 7)."/>
 </setting>
 <setting name="dummy">
 </setting>
@@ -297,6 +297,8 @@ but VLAN id from DEVICE takes precedence over VLAN_ID."/>
 </setting>
 <setting name="vxlan">
 </setting>
+<setting name="wifi-p2p">
+</setting>
 <setting name="wimax">
 </setting>
 <setting name="802-3-ethernet">
@@ -325,6 +327,8 @@ is listed."/>
 <property name="s390-options" variable="OPTIONS and PORTNAME, CTCPROTO," format="" values="" default="" example="" description="S390 device options. All options go to OPTIONS, except for
 &quot;portname&quot; and &quot;ctcprot&quot; that have their own variables."/>
 </setting>
+<setting name="wireguard">
+</setting>
 <setting name="802-11-wireless-security">
 <property name="key-mgmt" variable="KEY_MGMT(+)" format="" values="IEEE8021X, WPA-PSK, WPA-EAP" default="" example="" description="Key management menthod."/>
 <property name="wep-tx-keyidx" variable="DEFAULTKEY" format="" values="1, 2, 3, 4" default="1" example="" description="Index of active WEP key."/>
-- 
cgit 1.3.0-6-gf8a5


From 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sun, 21 Apr 2019 21:09:51 +0200
Subject: New upstream version 1.18.0

---
 libnm/nm-settings-ifcfg-rh-docs.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libnm/nm-settings-ifcfg-rh-docs.xml')

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=&quot;1 pvid untagged,20,300-400 untagged&quot;" 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=&quot;1 pvid untagged,20,300-400 untagged&quot;" description="List of VLANs on the bridge"/>
 </setting>
 <setting name="cdma">
 </setting>
-- 
cgit 1.3.0-6-gf8a5