about summary refs log tree commit diff
path: root/libnm/nm-settings-docs-gir.xml
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2021-08-16 09:52:58 +0200
committerMichael Biebl <biebl@debian.org>2021-08-16 09:52:58 +0200
commit4e636b195bda344f34514ebb1a855f99b004164b (patch)
tree8992a936f0a115aa3c60fe5cf8845085aab31f08 /libnm/nm-settings-docs-gir.xml
parentfac255a528d295b515fdb7867aac5cab8c6f823f (diff)
parentbfe522304da217296e2a61040f58e35ec5d6f3f2 (diff)
Update upstream source from tag 'upstream/1.30.6'
Update to upstream version '1.30.6'
with Debian dir b4583b68cbcf2c2cc2b9687a460901d0ed5f7e42
Diffstat (limited to 'libnm/nm-settings-docs-gir.xml')
-rw-r--r--libnm/nm-settings-docs-gir.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/libnm/nm-settings-docs-gir.xml b/libnm/nm-settings-docs-gir.xml
index f71d2bad..5089fb9e 100644
--- a/libnm/nm-settings-docs-gir.xml
+++ b/libnm/nm-settings-docs-gir.xml
@@ -362,8 +362,8 @@
     <property name="vfs" name_upper="VFS" type="array of vardict" description="Array of virtual function descriptors. Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF. When represented as string a VF is in the form: &quot;INDEX [ATTR=VALUE[ ATTR=VALUE]...]&quot;. for example: &quot;2 mac=00:11:22:33:44:55 spoof-check=true&quot;. Multiple VFs can be specified using a comma as separator. Currently, the following attributes are supported: mac, spoof-check, trust, min-tx-rate, max-tx-rate, vlans. The &quot;vlans&quot; attribute is represented as a semicolon-separated list of VLAN descriptors, where each descriptor has the form &quot;ID[.PRIORITY[.PROTO]]&quot;. PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad." />
   </setting>
   <setting name="tc" description="Linux Traffic Control Settings" name_upper="TC_CONFIG" >
-    <property name="qdiscs" name_upper="QDISCS" type="array of vardict" description="Array of TC queueing disciplines." />
-    <property name="tfilters" name_upper="TFILTERS" type="array of vardict" description="Array of TC traffic filters." />
+    <property name="qdiscs" name_upper="QDISCS" type="array of vardict" description="Array of TC queueing disciplines. When the &quot;tc&quot; setting is present, qdiscs from this property are applied upon activation. If the property is empty, all qdiscs are removed and the device will only have the default qdisc assigned by kernel according to the &quot;net.core.default_qdisc&quot; sysctl. If the &quot;tc&quot; setting is not present, NetworkManager doesn't touch the qdiscs present on the interface." />
+    <property name="tfilters" name_upper="TFILTERS" type="array of vardict" description="Array of TC traffic filters. When the &quot;tc&quot; setting is present, filters from this property are applied upon activation. If the property is empty, NetworkManager removes all the filters. If the &quot;tc&quot; setting is not present, NetworkManager doesn't touch the filters present on the interface." />
   </setting>
   <setting name="team" description="Teaming Settings" name_upper="TEAM" >
     <property name="config" name_upper="CONFIG" type="string" description="The JSON configuration for the team network interface.  The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used.  See man teamd.conf for the format details." />