diff --git a/src/core/devices/nm-device-bond.c b/src/core/devices/nm-device-bond.c index 6c87ee2d64..f7d78f57b7 100644 --- a/src/core/devices/nm-device-bond.c +++ b/src/core/devices/nm-device-bond.c @@ -447,7 +447,7 @@ enslave_slave(NMDevice *device, NMDevice *port, NMConnection *connection, gboole return FALSE; } - s_port = _nm_connection_get_setting_bond_port(connection); + s_port = _nm_connection_get_setting(connection, NM_TYPE_SETTING_BOND_PORT); commit_port_options(device, port, s_port); diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c index b648d5be6a..0ef2f3e5dc 100644 --- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c @@ -1894,7 +1894,7 @@ write_bond_port_setting(NMConnection *connection, shvarFile *ifcfg) { NMSettingBondPort *s_port; - s_port = _nm_connection_get_setting_bond_port(connection); + s_port = _nm_connection_get_setting(connection, NM_TYPE_SETTING_BOND_PORT); if (s_port) svSetValueInt64(ifcfg, "BOND_PORT_QUEUE_ID", nm_setting_bond_port_get_queue_id(s_port)); } diff --git a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index 6052a3714d..2bc46c9568 100644 --- a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -9464,7 +9464,7 @@ test_read_bond_port(void) g_assert_cmpstr(nm_setting_connection_get_master(s_con), ==, "bond99"); g_assert_cmpstr(nm_setting_connection_get_slave_type(s_con), ==, NM_SETTING_BOND_SETTING_NAME); - s_port = _nm_connection_get_setting_bond_port(connection); + s_port = _nm_connection_get_setting(connection, NM_TYPE_SETTING_BOND_PORT); g_assert(s_port); g_assert_cmpuint(nm_setting_bond_port_get_queue_id(s_port), ==, 1); } diff --git a/src/libnm-core-impl/nm-connection.c b/src/libnm-core-impl/nm-connection.c index d6efe918b8..9bc8df3f9b 100644 --- a/src/libnm-core-impl/nm-connection.c +++ b/src/libnm-core-impl/nm-connection.c @@ -3771,9 +3771,3 @@ nm_connection_default_init(NMConnectionInterface *iface) G_TYPE_NONE, 0); } - -NMSettingBondPort * -_nm_connection_get_setting_bond_port(NMConnection *connection) -{ - return _connection_get_setting_by_meta_type_check(connection, NM_META_SETTING_TYPE_BOND_PORT); -} diff --git a/src/libnm-core-intern/nm-core-internal.h b/src/libnm-core-intern/nm-core-internal.h index 7d3593365d..c50eaf41ee 100644 --- a/src/libnm-core-intern/nm-core-internal.h +++ b/src/libnm-core-intern/nm-core-internal.h @@ -986,6 +986,4 @@ gboolean _nm_ip_tunnel_mode_is_layer2(NMIPTunnelMode mode); GPtrArray *_nm_setting_ip_config_get_dns_array(NMSettingIPConfig *setting); -NMSettingBondPort *_nm_connection_get_setting_bond_port(NMConnection *connection); - #endif