shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-28 02:50:16 +03:00
Code

network: make erspan netdev can be specified in Network.Tunnel=

Browse Source
This commit is contained in:
Yu Watanabe 2019-03-30 03:34:03 +09:00
parent 1a9bc3d8f6
commit 9282f75bf4
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/network/netdev/netdev.c
View File

@ -779,6 +779,9 @@ int netdev_load_one(Manager *manager, const char *filename) {
case NETDEV_KIND_IP6TNL:
independent = IP6TNL(netdev)->independent;
break;
case NETDEV_KIND_ERSPAN:
independent = ERSPAN(netdev)->independent;
break;
default:
break;
}

2
src/network/netdev/tunnel.c
View File

@ -857,6 +857,6 @@ const NetDevVTable erspan_vtable = {
.init = erspan_init,
.sections = "Match\0NetDev\0Tunnel\0",
.fill_message_create = netdev_erspan_fill_message_create,
.create_type = NETDEV_CREATE_INDEPENDENT,
.create_type = NETDEV_CREATE_STACKED,
.config_verify = netdev_tunnel_verify,
};

3
src/network/networkd-network.c
View File

@ -104,7 +104,8 @@ static int network_resolve_netdev_one(Network *network, const char *name, NetDev
NETDEV_KIND_IP6GRETAP,
NETDEV_KIND_VTI,
NETDEV_KIND_VTI6,
NETDEV_KIND_IP6TNL)))
NETDEV_KIND_IP6TNL,
NETDEV_KIND_ERSPAN)))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: NetDev %s is not a %s, ignoring assignment",
network->filename, name, kind_string);