diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-01-22 14:49:24 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-01-25 11:25:17 +0100 |
| commit | 54abf461d6b10dc270c4bb2aeac65f240ff1c5cd (patch) | |
| tree | 5589a8c4ac8b3245c7e2e816bbac6c8bf42bca9e /src/network/networkd-link.c | |
| parent | 168a3f602fa2250dc0d0aab140ab91945d5f6efa (diff) | |
networkd: add basic VLAN support
Diffstat (limited to 'src/network/networkd-link.c')
| -rw-r--r-- | src/network/networkd-link.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index f746f2dcc4..17e7047bd5 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -786,7 +786,7 @@ static int link_enter_enslave(Link *link) { link->state = LINK_STATE_ENSLAVING; - if (!link->network->bridge && !link->network->bond) + if (!link->network->bridge && !link->network->bond && !link->network->vlan) return link_enslaved(link); if (link->network->bridge) { @@ -810,19 +810,19 @@ static int link_enter_enslave(Link *link) { link->enslaving ++; } - if (link->network->bond) { + if (link->network->vlan) { log_struct_link(LOG_DEBUG, link, "MESSAGE=%s: enslaving by '%s'", - link->network->bond->name, - NETDEV(link->network->bond), + link->network->vlan->name, + NETDEV(link->network->vlan), NULL); - r = netdev_enslave(link->network->bond, link, &enslave_handler); + r = netdev_enslave(link->network->vlan, link, &enslave_handler); if (r < 0) { log_struct_link(LOG_WARNING, link, "MESSAGE=%s: could not enslave by '%s': %s", - link->network->bond->name, strerror(-r), - NETDEV(link->network->bond), + link->network->vlan->name, strerror(-r), + NETDEV(link->network->vlan), NULL); link_enter_failed(link); return r; |