colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: branch 'bg/sriov-preserve-capability'

Browse Source 
manager: add a capability for "sriov.preserve-on-down"

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2234
This commit is contained in:
Beniamino Galvani
2025-07-01 07:37:17 +00:00
parent 5ab04c8f56 8e40f7e289
commit 25a5fd7503
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/nm-manager.c
View File

@@ -479,7 +479,8 @@ _version_info_get(void)
* with index 0-31 goes to element #1, with index 32-63 to element #2, * with index 0-31 goes to element #1, with index 32-63 to element #2,
* with index 64-95 to element #3 and so on. */ * with index 64-95 to element #3 and so on. */
(1 << NM_VERSION_INFO_CAPABILITY_SYNC_ROUTE_WITH_TABLE) (1 << NM_VERSION_INFO_CAPABILITY_SYNC_ROUTE_WITH_TABLE)
| (1 << NM_VERSION_INFO_CAPABILITY_IP4_FORWARDING), | (1 << NM_VERSION_INFO_CAPABILITY_IP4_FORWARDING)
| (1 << NM_VERSION_INFO_CAPABILITY_SRIOV_PRESERVE_ON_DOWN),
}; };
return nm_g_variant_new_au(arr, G_N_ELEMENTS(arr)); return nm_g_variant_new_au(arr, G_N_ELEMENTS(arr));

5
src/libnm-core-public/nm-dbus-interface.h
View File

@@ -100,7 +100,9 @@
* https://issues.redhat.com/browse/RHEL-66262 * https://issues.redhat.com/browse/RHEL-66262
* https://issues.redhat.com/browse/RHEL-67324 * https://issues.redhat.com/browse/RHEL-67324
* @NM_VERSION_INFO_CAPABILITY_IP4_FORWARDING: Indicates that NetworkManager supports * @NM_VERSION_INFO_CAPABILITY_IP4_FORWARDING: Indicates that NetworkManager supports
* configuring per-device IPv4 sysctl forwarding setting. Since: 1.56. * configuring per-device IPv4 sysctl forwarding setting. Since: 1.54.
* @NM_VERSION_INFO_CAPABILITY_SRIOV_PRESERVE_ON_DOWN: NetworkManager supports the
* "sriov.preserve-on-down" property. Since: 1.54
* *
* The numeric values represent the bit index of the capability. These capabilities * The numeric values represent the bit index of the capability. These capabilities
* can be queried in the "VersionInfo" D-Bus property. * can be queried in the "VersionInfo" D-Bus property.
@@ -110,6 +112,7 @@
typedef enum { typedef enum {
NM_VERSION_INFO_CAPABILITY_SYNC_ROUTE_WITH_TABLE = 0, NM_VERSION_INFO_CAPABILITY_SYNC_ROUTE_WITH_TABLE = 0,
NM_VERSION_INFO_CAPABILITY_IP4_FORWARDING = 1, NM_VERSION_INFO_CAPABILITY_IP4_FORWARDING = 1,
NM_VERSION_INFO_CAPABILITY_SRIOV_PRESERVE_ON_DOWN = 2,
} NMVersionInfoCapability; } NMVersionInfoCapability;
/** /**