diff options
| author | Michael Biebl <biebl@debian.org> | 2024-10-02 22:17:51 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-10-02 22:17:51 +0200 |
| commit | 56928734cbcf1d3a02fae4f152a541df1b04e04a (patch) | |
| tree | ff88b37a2bf9d26caf1830ceb1e9a131375b6894 /src/libnm-core-impl | |
| parent | df14a83a8b0c4354a51b392ae51a084b4b9c1b5a (diff) | |
New upstream version 1.50.0 upstream/1.50.0
Diffstat (limited to 'src/libnm-core-impl')
| -rw-r--r-- | src/libnm-core-impl/nm-setting-connection.c | 4 | ||||
| -rw-r--r-- | src/libnm-core-impl/tests/test-general.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c index b51cd46b..3298dce6 100644 --- a/src/libnm-core-impl/nm-setting-connection.c +++ b/src/libnm-core-impl/nm-setting-connection.c @@ -1379,13 +1379,13 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) if (connection) goto after_interface_name; iface_type = NMU_IFACE_ANY; - } else if (NM_IN_STRSET(ovs_iface_type, "patch")) { + } else if (NM_IN_STRSET(ovs_iface_type, "patch", "dpdk")) { /* this interface type is internal to OVS. */ iface_type = NMU_IFACE_OVS; } else { /* This interface type also requires a netdev. We need to validate * for both OVS and KERNEL. */ - nm_assert(NM_IN_STRSET(ovs_iface_type, "internal", "system", "dpdk")); + nm_assert(NM_IN_STRSET(ovs_iface_type, "internal", "system")); iface_type = NMU_IFACE_OVS_AND_KERNEL; } } else diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c index 0a39010c..8d4ea069 100644 --- a/src/libnm-core-impl/tests/test-general.c +++ b/src/libnm-core-impl/tests/test-general.c @@ -10832,7 +10832,7 @@ test_connection_ovs_ifname(gconstpointer test_data) /* good if bridge, port, or patch interface */ g_object_set(s_con, NM_SETTING_CONNECTION_INTERFACE_NAME, "ovs123123123123130123123", NULL); - if (!ovs_iface_type || nm_streq(ovs_iface_type, "patch")) + if (!ovs_iface_type || NM_IN_STRSET(ovs_iface_type, "patch", "dpdk")) nmtst_assert_connection_verifies(con); else { nmtst_assert_connection_unnormalizable(con, |