fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 03:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: merge branch 'th/vlan-reorder-hdr-rh1250225'

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=1250225
This commit is contained in:
Thomas Haller 2015-10-23 11:26:33 +02:00
commit 6ae618ef97
2 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libnm-core/nm-setting-vlan.c
View file

@ -558,6 +558,24 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
return TRUE; return TRUE;
} }
static GVariant *
_override_flags_get (NMSetting *setting, const char *property)
{
return g_variant_new_uint32 (nm_setting_vlan_get_flags ((NMSettingVlan *) setting));
}
static void
_override_flags_not_set (NMSetting *setting,
GVariant *connection_dict,
const char *property)
{
/* we changed the default value for FLAGS. When an older client
* doesn't serialize the property, we assume it is the old default. */
g_object_set (G_OBJECT (setting),
NM_SETTING_VLAN_FLAGS, (NMVlanFlags) 0,
NULL);
}
static GSList * static GSList *
priority_strv_to_maplist (NMVlanPriorityMap map, char **strv) priority_strv_to_maplist (NMVlanPriorityMap map, char **strv)
{ {
@ -736,6 +754,11 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class)
* output packet headers), %NM_VLAN_FLAG_GVRP (use of the GVRP protocol), * output packet headers), %NM_VLAN_FLAG_GVRP (use of the GVRP protocol),
* and %NM_VLAN_FLAG_LOOSE_BINDING (loose binding of the interface to its * and %NM_VLAN_FLAG_LOOSE_BINDING (loose binding of the interface to its
* master device's operating state). * master device's operating state).
*
* The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS,
* but it used to be 0. To preserve backward compatibility, the default-value
* in the D-Bus API continues to be 0 and a missing property on D-Bus
* is still considered as 0.
**/ **/
/* ---ifcfg-rh--- /* ---ifcfg-rh---
* property: flags * property: flags
@ -753,6 +776,11 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class)
G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |
G_PARAM_STATIC_STRINGS)); G_PARAM_STATIC_STRINGS));
_nm_setting_class_override_property (parent_class, NM_SETTING_VLAN_FLAGS,
NULL,
_override_flags_get,
NULL,
_override_flags_not_set);
/** /**
* NMSettingVlan:ingress-priority-map: * NMSettingVlan:ingress-priority-map:

2
libnm-util/nm-setting-vlan.c
View file

@ -805,7 +805,7 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class)
g_object_class_install_property g_object_class_install_property
(object_class, PROP_FLAGS, (object_class, PROP_FLAGS,
g_param_spec_uint (NM_SETTING_VLAN_FLAGS, "", "", g_param_spec_uint (NM_SETTING_VLAN_FLAGS, "", "",
0, G_MAXUINT32, NM_VLAN_FLAG_REORDER_HEADERS, 0, G_MAXUINT32, 0,
G_PARAM_READWRITE | G_PARAM_READWRITE |
G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT |
NM_SETTING_PARAM_INFERRABLE | NM_SETTING_PARAM_INFERRABLE |