Revert "device: bind the generated loopback connection to 'lo' interface"

This reverts commit 9a019f1fb5.

Generic connections should be bound to their interface names in a more generic
way instead of in nm-device.c.  The Generic device itself should set the
attributes it needs when generating the connection, like other device types do.
This will be done in a following commit.
This commit is contained in:
Dan Williams
2013-11-14 10:12:25 -06:00
parent 664d64e0c0
commit 038e45d29a

View File

@@ -1694,12 +1694,6 @@ nm_device_generate_connection (NMDevice *device)
g_object_set (s_con, NM_SETTING_CONNECTION_TYPE, klass->connection_type, NULL); g_object_set (s_con, NM_SETTING_CONNECTION_TYPE, klass->connection_type, NULL);
nm_connection_add_setting (connection, s_con); nm_connection_add_setting (connection, s_con);
/* Bind loopback connection to 'lo' device */
if (nm_platform_link_get_type (ifindex) == NM_LINK_TYPE_LOOPBACK)
g_object_set (s_con,
NM_SETTING_CONNECTION_INTERFACE_NAME, ifname,
NULL);
/* If the device is a slave, update various slave settings */ /* If the device is a slave, update various slave settings */
if (ifindex) if (ifindex)
master_ifindex = nm_platform_link_get_master (ifindex); master_ifindex = nm_platform_link_get_master (ifindex);