summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2013-11-14 10:12:25 -0600
committerDan Williams <dcbw@redhat.com>2013-12-02 15:32:23 -0600
commit038e45d29ab634af9d733024fdcdc20789db266d (patch)
tree0f243cb7d949f35a8b9e77eff0e43a8381ed9579
parent664d64e0c04bd4b83137a682ff9a9881966f6f94 (diff)
downloadNetworkManager-038e45d29ab634af9d733024fdcdc20789db266d.tar.gz
Revert "device: bind the generated loopback connection to 'lo' interface"
This reverts commit 9a019f1fb5b7d99a7d4ec7af89212402ea81793a. 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.
-rw-r--r--src/devices/nm-device.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 262f627329..9f89c8605d 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -1694,12 +1694,6 @@ nm_device_generate_connection (NMDevice *device)
g_object_set (s_con, NM_SETTING_CONNECTION_TYPE, klass->connection_type, NULL);
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 (ifindex)
master_ifindex = nm_platform_link_get_master (ifindex);