diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2015-08-28 16:45:42 +0200 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2015-10-07 13:45:30 +0200 |
| commit | 687b6515980c08cdbb9734bd112a594166c4d6dd (patch) | |
| tree | 090a249054b802de82b85f9fef4ed771297d8577 /libnm-util | |
| parent | c41be469ab107ea2b4813bf28a1618572b78aa6a (diff) | |
| download | NetworkManager-687b6515980c08cdbb9734bd112a594166c4d6dd.tar.gz | |
libnm/vlan: default to vlan.flags=REORDER_HDR for new connections (rh #1250225)
The kernel defaults REORDER_HDR to 1 when creating a new VLAN, but
NetworkManager's VLAN flags property defaulted to 0. Thus REORDER_HDR was not
set for NM-created VLANs with default values.
We want to match the kernel default, so we change the default value for the
vlan.flags property. However, we do not want to change the flags for existing
connections if the property is missing in connection files. Thus we have to
update plugins for that. We also make sure that vlan.flags is always written
by 'keyfile' when the value is default. That way new connections have flags
property explicitly written and it will be loaded as expected.
https://bugzilla.redhat.com/show_bug.cgi?id=1250225
Diffstat (limited to 'libnm-util')
| -rw-r--r-- | libnm-util/nm-setting-vlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c index 52676d47f0..c3d4bb58f1 100644 --- a/libnm-util/nm-setting-vlan.c +++ b/libnm-util/nm-setting-vlan.c @@ -805,7 +805,7 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) g_object_class_install_property (object_class, PROP_FLAGS, g_param_spec_uint (NM_SETTING_VLAN_FLAGS, "", "", - 0, G_MAXUINT32, 0, + 0, G_MAXUINT32, NM_VLAN_FLAG_REORDER_HEADERS, G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | |