From 527cbf19246baf07d23cd14218aea5e723f7098d Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 11 Feb 2013 10:54:51 -0600 Subject: [PATCH] Revert "core: fix duplicating (not removing) active connections" This reverts commit df796527a44ba9ca4e267afa26e242c6d2b9dec8. We found the real problem. --- src/nm-activation-request.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c index 29fd7e2ee..88504ce0d 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -298,7 +298,6 @@ static void device_state_changed (NMDevice *device, GParamSpec *pspec, NMActRequest *self) { NMActiveConnectionState ac_state = NM_ACTIVE_CONNECTION_STATE_UNKNOWN; - NMActiveConnectionState prev_ac_state = nm_active_connection_get_state (NM_ACTIVE_CONNECTION (self)); /* Set NMActiveConnection state based on the device's state */ switch (nm_device_get_state (device)) { @@ -330,11 +329,7 @@ device_state_changed (NMDevice *device, GParamSpec *pspec, NMActRequest *self) nm_active_connection_set_default6 (NM_ACTIVE_CONNECTION (self), FALSE); } - /* Only set new state if we are not in DEACTIVATED. Those connections - * will be removed. See _active_connection_cleanup() in nm-manager.c - */ - if (prev_ac_state != NM_ACTIVE_CONNECTION_STATE_DEACTIVATED) - nm_active_connection_set_state (NM_ACTIVE_CONNECTION (self), ac_state); + nm_active_connection_set_state (NM_ACTIVE_CONNECTION (self), ac_state); } /********************************************************************/