diff options
| author |   Daniel Borkmann <daniel@iogearbox.net> | 2016-03-16 01:42:51 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-03-18 19:38:46 -0400 |
| commit | fca5fdf67de9e092fda23c9eb059ba968e7b5267 (patch) | |
| tree | 06aa42e0d7679a15e223a05acd202d2897252bb1 /net/ipv4/ip_tunnel_core.c | |
| parent | bpf, dst: add and use dst_tclassid helper (diff) | |
| download | linux-dev-fca5fdf67de9e092fda23c9eb059ba968e7b5267.tar.xz linux-dev-fca5fdf67de9e092fda23c9eb059ba968e7b5267.zip | |
ip_tunnels, bpf: define IP_TUNNEL_OPTS_MAX and use it
eBPF defines this as BPF_TUNLEN_MAX and OVS just uses the hard-coded
value inside struct sw_flow_key. Thus, add and use IP_TUNNEL_OPTS_MAX
for this, which makes the code a bit more generic and allows to remove
BPF_TUNLEN_MAX from eBPF code.
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/ip_tunnel_core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c index eaca2449a09a..d27276f6f8dd 100644 --- a/net/ipv4/ip_tunnel_core.c +++ b/net/ipv4/ip_tunnel_core.c @@ -398,6 +398,12 @@ static const struct lwtunnel_encap_ops ip6_tun_lwt_ops = { void __init ip_tunnel_core_init(void) { + /* If you land here, make sure whether increasing ip_tunnel_info's + * options_len is a reasonable choice with its usage in front ends + * (f.e., it's part of flow keys, etc). + */ + BUILD_BUG_ON(IP_TUNNEL_OPTS_MAX != 255); + lwtunnel_encap_add_ops(&ip_tun_lwt_ops, LWTUNNEL_ENCAP_IP); lwtunnel_encap_add_ops(&ip6_tun_lwt_ops, LWTUNNEL_ENCAP_IP6); } |