diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2014-09-24 16:02:37 +0200 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2014-09-26 11:17:57 +0200 |
| commit | c9b9229c2e7de2bbb12e493a868921b7a788ee92 (patch) | |
| tree | 7fe9d58f462ec7a1efd01130ed47db6e6021e220 /src/nm-active-connection.c | |
| parent | 53f396702649974e20a56e0ce68db371a3a6711d (diff) | |
| download | NetworkManager-c9b9229c2e7de2bbb12e493a868921b7a788ee92.tar.gz | |
core: do not assert when a device is enslaved externally
Test case:
# ip link add name BR type bridge
# brctl addif BR eth0
Monitoring external master/slave changes was intruduced by
08e0cfb484dfc6aa6342871158ffe752c7c50f03.
Diffstat (limited to 'src/nm-active-connection.c')
| -rw-r--r-- | src/nm-active-connection.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c index 30e319b2e2..130b5229b0 100644 --- a/src/nm-active-connection.c +++ b/src/nm-active-connection.c @@ -365,11 +365,11 @@ device_master_changed (GObject *object, return; if (!nm_device_get_master (device)) return; + if (!nm_active_connection_get_master (self)) + return; g_signal_handlers_disconnect_by_func (device, G_CALLBACK (device_master_changed), self); master = nm_active_connection_get_master (self); - g_assert (master); - master_state = nm_active_connection_get_state (master); if (master_state >= NM_ACTIVE_CONNECTION_STATE_DEACTIVATING) { /* Master failed before attaching the slave */ |