summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Šimerda <psimerda@redhat.com>2013-08-22 20:41:01 +0200
committerPavel Šimerda <psimerda@redhat.com>2013-08-29 19:58:46 +0200
commit3460895bd3f4ddb631f8f94d9c1eddcd3ba7ef64 (patch)
tree040a1cf537596ee377c560e2cf58ee00cbf3f494
parent006aa4202cb428bb5f91a40b867a70ae4f968a32 (diff)
downloadNetworkManager-3460895bd3f4ddb631f8f94d9c1eddcd3ba7ef64.tar.gz
core: support slave devices in nm_platform_generate_connection()
-rw-r--r--src/devices/nm-device.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index a87d228d5f..86b85f951d 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -1693,6 +1693,12 @@ nm_device_generate_connection (NMDevice *device)
NULL);
if (klass->connection_type)
g_object_set (s_con, NM_SETTING_CONNECTION_TYPE, klass->connection_type, NULL);
+ if (priv->master) {
+ g_object_set (s_con,
+ NM_SETTING_CONNECTION_MASTER, nm_device_get_iface (priv->master),
+ NM_SETTING_CONNECTION_SLAVE_TYPE, NM_DEVICE_GET_CLASS (priv->master)->connection_type,
+ NULL);
+ }
nm_ip4_config_update_setting (priv->ip4_config, (NMSettingIP4Config *) s_ip4);
nm_ip6_config_update_setting (priv->ip6_config, (NMSettingIP6Config *) s_ip6);