fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-21 05:10:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: fix adding VLAN flags

Browse source 
We need to unset flags first.
This commit is contained in:
Jiří Klimeš 2015-09-03 16:01:51 +02:00 • committed by Thomas Haller
parent 3385dcdc5a
commit db62fc9d72
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/platform/nm-linux-platform.c
View file

@ -3220,6 +3220,7 @@ vlan_add (NMPlatform *platform,
{ {
auto_nl_object struct rtnl_link *rtnllink = (struct rtnl_link *) build_rtnl_link (0, name, NM_LINK_TYPE_VLAN); auto_nl_object struct rtnl_link *rtnllink = (struct rtnl_link *) build_rtnl_link (0, name, NM_LINK_TYPE_VLAN);
unsigned int kernel_flags; unsigned int kernel_flags;
unsigned int all_flags = VLAN_FLAG_REORDER_HDR | VLAN_FLAG_GVRP | VLAN_FLAG_LOOSE_BINDING;
kernel_flags = 0; kernel_flags = 0;
if (vlan_flags & NM_VLAN_FLAG_REORDER_HEADERS) if (vlan_flags & NM_VLAN_FLAG_REORDER_HEADERS)
@ -3231,6 +3232,7 @@ vlan_add (NMPlatform *platform,
rtnl_link_set_link (rtnllink, parent); rtnl_link_set_link (rtnllink, parent);
rtnl_link_vlan_set_id (rtnllink, vlan_id); rtnl_link_vlan_set_id (rtnllink, vlan_id);
rtnl_link_vlan_unset_flags (rtnllink, all_flags);
rtnl_link_vlan_set_flags (rtnllink, kernel_flags); rtnl_link_vlan_set_flags (rtnllink, kernel_flags);
_LOGD ("link: add vlan '%s', parent %d, vlan id %d, flags %X (native: %X)", _LOGD ("link: add vlan '%s', parent %d, vlan id %d, flags %X (native: %X)",