Commit e28e87ed authored Mar 08, 2016 by Daniel Borkmann Committed by David S. Miller Mar 08, 2016

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: 14ca0751 ("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>

parent f14b488d

include/net/ip_tunnels.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -369,6 +369,17 @@ static inline void ip_tunnel_unneed_metadata(void)
		{
		}

		static inline void ip_tunnel_info_opts_get(void *to,
		const struct ip_tunnel_info *info)
		{
		}

		static inline void ip_tunnel_info_opts_set(struct ip_tunnel_info *info,
		const void *from, int len)
		{
		info->options_len = 0;
		}

		#endif /* CONFIG_INET */

		#endif /* __NET_IP_TUNNELS_H */

Admin message