diff options
| author | Daniel Mack <daniel@zonque.org> | 2015-07-29 20:31:15 +0200 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2015-07-29 20:31:15 +0200 |
| commit | c2570b3de2430b06f545e78ff32b97503f81f09f (patch) | |
| tree | 9f58e23600a681723f393f71bb19d10f23df5050 /src/network/networkd-netdev-tunnel.h | |
| parent | 7fc309b3a83c6f8a6f06b9bbea0c5ea379cef68e (diff) | |
| parent | 8110e144ff5c3a95a2ac82691ee11528b4e6642a (diff) | |
Merge branch 'master' of github.com:systemd/systemd
Diffstat (limited to 'src/network/networkd-netdev-tunnel.h')
| -rw-r--r-- | src/network/networkd-netdev-tunnel.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/network/networkd-netdev-tunnel.h b/src/network/networkd-netdev-tunnel.h index 1fd2b94ae1..e4fa74aef4 100644 --- a/src/network/networkd-netdev-tunnel.h +++ b/src/network/networkd-netdev-tunnel.h @@ -45,6 +45,7 @@ struct Tunnel { uint8_t encap_limit; int family; + int ipv6_flowlabel; unsigned ttl; unsigned tos; @@ -54,7 +55,6 @@ struct Tunnel { union in_addr_union remote; Ip6TnlMode ip6tnl_mode; - IPv6FlowLabel ipv6_flowlabel; bool pmtudisc; bool copy_dscp; @@ -90,9 +90,6 @@ int config_parse_tunnel_address(const char *unit, void *data, void *userdata); -const char *ipv6_flowlabel_to_string(IPv6FlowLabel d) _const_; -IPv6FlowLabel ipv6_flowlabel_from_string(const char *d) _pure_; - int config_parse_ipv6_flowlabel(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, |