From 14b0f3a9dc9ea90d60a3b057350fd4d637dc021a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 28 Jun 2023 15:04:35 +0200 Subject: New upstream version 1.42.8 --- docs/api/Makefile.in | 1 + docs/api/html/NetworkManager.conf.html | 2 +- docs/api/html/index.html | 2 +- docs/api/html/ix01.html | 2 +- docs/api/html/nm-settings-dbus.html | 19 ++++++++++++++++--- docs/api/html/nm-settings-ifcfg-rh.html | 22 +++++++++++++++++----- docs/api/html/nm-settings-nmcli.html | 20 +++++++++++++++++--- docs/api/html/settings-bond-port.html | 12 ++++++++++-- docs/api/settings-spec.xml | 2 +- docs/api/version.xml | 2 +- 10 files changed, 66 insertions(+), 18 deletions(-) (limited to 'docs/api') diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index 62582bcc..d7a09949 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -326,6 +326,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ +PPPD_CFLAGS = @PPPD_CFLAGS@ PPPD_PATH = @PPPD_PATH@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ PTHREAD_CC = @PTHREAD_CC@ diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html index 30d5660a..b4134352 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html @@ -1565,7 +1565,7 @@ enable=nm-version-max:1.2.6 NM_CONFIG_ENABLE_TAG, like: 

-# always skip loading the file when running NetworkManager with
+# only load the file when running NetworkManager with
 # environment variable "NM_CONFIG_ENABLE_TAG=TAG1"
 [.config]
 enable=env:TAG1
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index 3ce39694..56e3108b 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -16,7 +16,7 @@
 

 

 

-      for NetworkManager 1.42.6
+      for NetworkManager 1.42.8
 
       The latest version of this documentation can be found on-line at
       https://networkmanager.dev/docs/api/latest/.
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html
index e087c18a..0a54382c 100644
--- a/docs/api/html/ix01.html
+++ b/docs/api/html/ix01.html
@@ -1343,7 +1343,7 @@
 
 
org.freedesktop.NetworkManager.PPP.SetState(), The SetState() method
 

-
prio, team-port
+
prio, team-port, bond-port
 

 
priority, bridge, bridge-port, hostname
 

diff --git a/docs/api/html/nm-settings-dbus.html b/docs/api/html/nm-settings-dbus.html
index f78c2612..778860e6 100644
--- a/docs/api/html/nm-settings-dbus.html
+++ b/docs/api/html/nm-settings-dbus.html
@@ -1609,7 +1609,11 @@ This property is deprecated since version 1.16.User-provided values for this set
 p-key
 int32
 -1
-The InfiniBand P_Key to use for this device. A value of -1 means to use the default P_Key (aka "the P_Key at index 0"). Otherwise, it is a 16-bit unsigned integer, whose high bit is set if it is a "full membership" P_Key.
+The InfiniBand p-key to use for this device. A value of -1 means to use the default p-key (aka "the p-key at index 0"). Otherwise, it is a 16-bit unsigned integer, whose high bit 0x8000 is set if it is a "full membership" p-key. The values 0 and 0x8000 are not allowed.
+
+With the p-key set, the interface name is always "$parent.$p_key". Setting "connection.interface-name" to another name is not supported.
+
+Note that kernel will internally always set the full membership bit, although the interface name does not reflect that. Usually the user would want to configure a full membership p-key with 0x8000 flag set.
 
 
 
@@ -4672,13 +4676,22 @@ WPS can be disabled by setting this property to a value of 1.
 Default Value
 Value Description
 
-
+
+
+
+prio
+int32
+0
+The port priority for bond active port re-selection during failover. A higher number means a higher priority in selection. The primary port has the highest priority. This option is only compatible with active-backup, balance-tlb and balance-alb modes.
+
+
 
 queue-id
 uint32
 0
 The queue ID of this bond port. The maximum value of queue ID is the number of TX queues currently active in device.
-
+
+
 

 

 

diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html
index a63ae165..f5674127 100644
--- a/docs/api/html/nm-settings-ifcfg-rh.html
+++ b/docs/api/html/nm-settings-ifcfg-rh.html
@@ -1101,14 +1101,26 @@ Example: BONDING_OPTS="miimon=100 mode=broadcast"
 Default
 Description
 
-
+
+
 queue-id
-BONDING_OPTS: queue-id=
+BOND_PORT_QUEUE_ID(+)
+
 0
 Queue ID.
 
 Allowed values: 0 - 65535
-
+
+
+prio
+BOND_PORT_PRIO(+)
+
+0
+Port priority.
+
+Allowed values: -2147483648 - 2147483647
+
+
 
 
 

@@ -1892,9 +1904,9 @@ Example: HWADDR=01:02:03:04:05:06:07:08:09:0A:01:02:03:04:05:06:
 
 
 p-key
-PKEY_ID (and PKEY=yes)
+PKEY_ID or PKEY_ID_NM(*) (requires PKEY=yes)
 PKEY=no
-InfiniBand P_Key. The value can be a hex number prefixed with "0x" or a decimal number. When PKEY_ID is specified, PHYSDEV and DEVICE also must be specified.
+InfiniBand P_Key. The value can be a hex number prefixed with "0x" or a decimal number. When PKEY_ID is specified, PHYSDEV must be specified. Note that ifcfg-rh format will always automatically set the full membership flag 0x8000 for the PKEY_ID variable. To express IDs without the full membership flag, use PKEY_ID_NM. Note that kernel internally treats the interface as having the full membership flag set, this mainly affects the interface name. For the ifcfg file to be supported by initscripts' ifup-ib, the DEVICE= must always be set. NetworkManager does not require that.
 
 Example: PKEY=yes PKEY_ID=2 PHYSDEV=mlx4_ib0 DEVICE=mlx4_ib0.8002
 
diff --git a/docs/api/html/nm-settings-nmcli.html b/docs/api/html/nm-settings-nmcli.html
index 0f6798b4..139eac2f 100644
--- a/docs/api/html/nm-settings-nmcli.html
+++ b/docs/api/html/nm-settings-nmcli.html
@@ -1975,7 +1975,9 @@
 
 

             Alias: p-key

-
The InfiniBand P_Key to use for this device. A value of -1 means to use the default P_Key (aka "the P_Key at index 0"). Otherwise, it is a 16-bit unsigned integer, whose high bit is set if it is a "full membership" P_Key.

+
The InfiniBand p-key to use for this device. A value of -1 means to use the default p-key (aka "the p-key at index 0"). Otherwise, it is a 16-bit unsigned integer, whose high bit 0x8000 is set if it is a "full membership" p-key. The values 0 and 0x8000 are not allowed.

+
With the p-key set, the interface name is always "$parent.$p_key". Setting "connection.interface-name" to another name is not supported.

+
Note that kernel will internally always set the full membership bit, although the interface name does not reflect that. Usually the user would want to configure a full membership p-key with 0x8000 flag set.

 

             Format: int32

 
@@ -5485,7 +5487,18 @@ Linux traffic control subsystem
 
 
 
-
+
+
+
prio

+
+

+            Alias: prio

+
The port priority for bond active port re-selection during failover. A higher number means a higher priority in selection. The primary port has the highest priority. This option is only compatible with active-backup, balance-tlb and balance-alb modes.

+

+            Format: int32

+
+
+
 
queue-id

 
 

@@ -5494,7 +5507,8 @@ Linux traffic control subsystem
 

             Format: uint32

 
-
+
+
 

 
 

diff --git a/docs/api/html/settings-bond-port.html b/docs/api/html/settings-bond-port.html
index 6daf9a3d..4cece6ef 100644
--- a/docs/api/html/settings-bond-port.html
+++ b/docs/api/html/settings-bond-port.html
@@ -52,12 +52,20 @@
 Default Value
 Value Description
 
-
+
+
+
prio

+
int32

+
0

+ 
+
+
 
queue-id

 
uint32

 
0

  
-
+
+
 
 
 


diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index e12bab3c..ee0b1a61 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -98,7 +98,7 @@
             Properties
         Key NameValue TypeDefault ValueValue Descriptionchannelchannelint32-1mac-addressmac-addressstringpagepageint32-1pan-idpan-iduint3265535short-addressshort-addressuint3265535
bond-portBond Port Settings
             Properties
-        Key NameValue TypeDefault ValueValue Descriptionqueue-idqueue-iduint320
hostnameHostname settings
+        Key NameValue TypeDefault ValueValue Descriptionprioprioint320queue-idqueue-iduint320
hostnameHostname settings
             Properties
         Key NameValue TypeDefault ValueValue Descriptionfrom-dhcpfrom-dhcpNMTernary (int32)from-dns-lookupfrom-dns-lookupNMTernary (int32)only-from-defaultonly-from-defaultNMTernary (int32)prioritypriorityint320
loopbackLoopback Link Settings
             Properties
diff --git a/docs/api/version.xml b/docs/api/version.xml
index 5f1d262b..31ffe251 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.42.6
+1.42.8
-- 
cgit 1.3.0-6-gf8a5