colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "core: fix duplicating (not removing) active connections"

Browse Source 
This reverts commit df796527a4.

We found the real problem.
This commit is contained in:
Dan Williams
2013-02-11 10:54:51 -06:00
parent fc700e9213
commit 527cbf1924
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nm-activation-request.c
View File

@@ -298,7 +298,6 @@ static void
device_state_changed (NMDevice *device, GParamSpec *pspec, NMActRequest *self) device_state_changed (NMDevice *device, GParamSpec *pspec, NMActRequest *self)
{ {
NMActiveConnectionState ac_state = NM_ACTIVE_CONNECTION_STATE_UNKNOWN; 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 */ /* Set NMActiveConnection state based on the device's state */
switch (nm_device_get_state (device)) { switch (nm_device_get_state (device)) {
@@ -330,10 +329,6 @@ device_state_changed (NMDevice *device, GParamSpec *pspec, NMActRequest *self)
nm_active_connection_set_default6 (NM_ACTIVE_CONNECTION (self), FALSE); 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);
} }