diff options
| author | Tobias Jungel <tobias.jungel@bisdn.de> | 2016-08-04 17:11:13 +0200 |
|---|---|---|
| committer | Tobias Jungel <tobias.jungel@bisdn.de> | 2016-08-04 17:14:18 +0200 |
| commit | ffff9abe1d4dc61d6f9a47ce0f3f85a3854373cf (patch) | |
| tree | f4b80e8e2ef0f5571325dfbfa033faad30c19288 /src/network/networkd-link.c | |
| parent | eb18df724ba541ac1c7fd5c77d9244fa6bc5cabf (diff) | |
networkd: apply bridge vlan configuration correct
bridge vlan configuration was applied even if it wasn't configured.
fixes #3876
Diffstat (limited to 'src/network/networkd-link.c')
| -rw-r--r-- | src/network/networkd-link.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 3e10ab1e04..e1d07eb4b0 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -2060,7 +2060,8 @@ static int link_joined(Link *link) { log_link_error_errno(link, r, "Could not set bridge message: %m"); } - if (link->network->bridge || streq_ptr("bridge", link->kind)) { + if (link->network->use_br_vlan && + (link->network->bridge || streq_ptr("bridge", link->kind))) { r = link_set_bridge_vlan(link); if (r < 0) log_link_error_errno(link, r, "Could not set bridge vlan: %m"); |