diff options
| author | Dan Williams <dcbw@redhat.com> | 2015-04-13 11:43:12 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2015-05-06 16:14:24 -0500 |
| commit | cd3df12c8f8ed6c868c12bc4e7fe6ba162dafc5b (patch) | |
| tree | a0d645ff29c22751bdbd9ded69f3f520a92dd2f8 /introspection | |
| parent | 477cbc848af27f0eccf59092873d75e5a50552c1 (diff) | |
| download | NetworkManager-cd3df12c8f8ed6c868c12bc4e7fe6ba162dafc5b.tar.gz | |
vlan: don't fail if parent isn't found at construct time for existing devices
For existing devices, depending on the order that netlink sends interfaces to
us, the parent may be found after the VLAN interface and not be available when
the VLAN interface is constructed. Instead of failing construction, when a
NMDeviceVlan has no parent keep it unavailable for activation. Then have
the Manager notify existing devices when a new device is found, and let
NMDeviceVlan find the parent later and become available via that mechanism.
This doesn't apply to VLANs created by NM itself, because the kernel requires
a parent ifindex when creating a VLAN device. Thus this fix only applies to
VLANs created outside NetworkManager, or existing when NM starts up.
Diffstat (limited to 'introspection')
| -rw-r--r-- | introspection/nm-device.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml index 7aef2f35b1..71b830f108 100644 --- a/introspection/nm-device.xml +++ b/introspection/nm-device.xml @@ -648,6 +648,16 @@ A new connection activation was enqueued. </tp:docstring> </tp:enumvalue> + <tp:enumvalue suffix="PARENT_CHANGED" value="61"> + <tp:docstring> + The device's parent changed. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="PARENT_MANAGED_CHANGED" value="62"> + <tp:docstring> + The device parent's management changed. + </tp:docstring> + </tp:enumvalue> </tp:enum> <tp:struct name="NM_DEVICE_STATE_REASON_STRUCT"> |