]> git.baikalelectronics.ru Git - kernel.git/commit
ip_tunnel, bpf: ip_tunnel_info_opts_{get, set} depends on CONFIG_INET
authorDaniel Borkmann <daniel@iogearbox.net>
Tue, 8 Mar 2016 22:36:03 +0000 (23:36 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Mar 2016 04:20:53 +0000 (23:20 -0500)
commit77faf06b9f4ff533f7a5f89fc40b1811d2a7359b
tree58a8bd2f09a408dc2cd3c792e9424a09e6b9f713
parentd18a055df373dc41afb63784fd65ebf120e1ee89
ip_tunnel, bpf: ip_tunnel_info_opts_{get, set} depends on CONFIG_INET

Helpers like ip_tunnel_info_opts_{get,set}() are only available if
CONFIG_INET is set, thus add an empty definition into the header for
the !CONFIG_INET case, where already other empty inline helpers are
defined.

This avoids ifdef kludge inside filter.c, but also vxlan and geneve
themself where this facility can only be used with, depend on INET
being set. For the !INET case TUNNEL_OPTIONS_PRESENT would never be
set in flags.

Fixes: 04dee2cf45c5 ("bpf: support for access to tunnel options")
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/ip_tunnels.h