diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2014-12-05 13:02:40 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2014-12-05 13:37:08 +0100 |
| commit | ba6bff5ae82459010b2172ca3af91154fcef0995 (patch) | |
| tree | 95ab0e61f033e09927083e6fee90b419bf8e5914 | |
| parent | 5abe8b909d3521e47501cd07011cb6b7488fa547 (diff) | |
| download | NetworkManager-lr/bridge.tar.gz | |
ohavnost2lr/bridge
| -rw-r--r-- | src/devices/nm-device.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 26a9971ff1..a9a074685c 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -1387,6 +1387,7 @@ nm_device_master_add_slave (NMDevice *self, NMDevice *slave, gboolean configure) G_CALLBACK (slave_state_changed), self); priv->slaves = g_slist_append (priv->slaves, info); } + nm_device_queue_recheck_assume (self); return TRUE; } @@ -1972,8 +1973,9 @@ nm_device_generate_connection (NMDevice *self, NMDevice *master) ip6_method = nm_utils_get_ip_config_method (connection, NM_TYPE_SETTING_IP6_CONFIG); if ( g_strcmp0 (ip4_method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED) == 0 && g_strcmp0 (ip6_method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE) == 0 - && !nm_setting_connection_get_master (NM_SETTING_CONNECTION (s_con))) { - _LOGD (LOGD_DEVICE, "ignoring generated connection (no IP and not slave)"); + && !nm_setting_connection_get_master (NM_SETTING_CONNECTION (s_con)) + && !priv->slaves) { + _LOGD (LOGD_DEVICE, "ignoring generated connection (no IP and not in master-slave relationship)"); g_object_unref (connection); connection = NULL; } |