diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2015-10-13 10:05:19 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-10-27 17:17:05 +0100 |
| commit | 689de5c94ad64a6461fbc24823a9bf31aa9e8442 (patch) | |
| tree | d542d42435ec647b743566bcfcb69e84919c22fa /libnm-core/nm-setting-vlan.c | |
| parent | 93b8871f5637713e02eb016b8b7ee786a3eaf8ad (diff) | |
| download | NetworkManager-689de5c94ad64a6461fbc24823a9bf31aa9e8442.tar.gz | |
vlan: (all) add VLAN MVRP flag
http://patchwork.ozlabs.org/patch/219364/
Diffstat (limited to 'libnm-core/nm-setting-vlan.c')
| -rw-r--r-- | libnm-core/nm-setting-vlan.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c index a9b105e280..66661ec613 100644 --- a/libnm-core/nm-setting-vlan.c +++ b/libnm-core/nm-setting-vlan.c @@ -567,9 +567,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) } } - if (priv->flags & ~(NM_VLAN_FLAG_REORDER_HEADERS | - NM_VLAN_FLAG_GVRP | - NM_VLAN_FLAG_LOOSE_BINDING)) { + if (priv->flags & ~NM_VLAN_FLAGS_ALL) { g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -778,7 +776,8 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) * interface. Flags include %NM_VLAN_FLAG_REORDER_HEADERS (reordering of * 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 - * master device's operating state). + * master device's operating state). %NM_VLAN_FLAG_MVRP (use of the MVRP + * protocol). * * 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 @@ -787,8 +786,8 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) **/ /* ---ifcfg-rh--- * property: flags - * variable: REORDER_HDR, GVRP, VLAN_FLAGS - * values: "yes or "no" for REORDER_HDR and GVRP; "LOOSE_BINDING" for VLAN_FLAGS + * variable: REORDER_HDR, GVRP, MVRP, VLAN_FLAGS + * values: "yes or "no" for REORDER_HDR, GVRP and MVRP; "LOOSE_BINDING" for VLAN_FLAGS * description: VLAN flags. * ---end--- */ |