diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-12-16 18:51:58 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-12-16 18:53:27 +0100 |
| commit | 2e22880894cf3b15da5512bfd00803b82e9274d1 (patch) | |
| tree | ec9ebc13aa3b07caf94886b3f23e7fa7fd95a00a | |
| parent | 88f3aba9bfaf8435bae8a4836f5fdb955c21ac2d (diff) | |
| download | NetworkManager-2e22880894cf3b15da5512bfd00803b82e9274d1.tar.gz | |
device: don't remove the device from master if its link has no master
We only need to do that when we're replacing the master with a different
one. Just after the link creation is has no master and we'd remove it
from the master device here.
| -rw-r--r-- | src/devices/nm-device.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 9fb944c25d..c6745b9503 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -1406,6 +1406,9 @@ device_recheck_slave_status (NMDevice *self, const NMPlatformLink *plink) g_return_if_fail (plink); + if (plink->master <= 0) + return; + if (priv->master) { if ( plink->master > 0 && plink->master == nm_device_get_ifindex (priv->master)) { |