diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2014-11-04 09:41:42 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2014-11-04 09:42:20 +0100 |
| commit | 53250f25e2443e8a13190a07b38683aa85d9e4d6 (patch) | |
| tree | b346482ab7f1ab0722a5a88d5c0255946a5c8e1e | |
| parent | 0847ba7490c718c6b72cce5ad7e6a53a5f2928f1 (diff) | |
| download | NetworkManager-lr/team-activation.tar.gz | |
device: Don't delete the link if a re-activation is scheduledlr/team-activation
| -rw-r--r-- | src/devices/nm-device.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index af5e52750c..66b0ee71ee 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -5084,6 +5084,8 @@ delete_on_deactivate_check_and_schedule (NMDevice *self, int ifindex) return; if (!priv->is_nm_owned) return; + if (priv->queued_act_request) + return; if (!nm_device_is_software (self)) return; if (nm_device_get_state (self) == NM_DEVICE_STATE_UNMANAGED) |