Commit 05283187 authored Jul 22, 2015 by Thomas Graf Committed by David S. Miller Jul 22, 2015

ip_tunnel: Provide tunnel metadata API for CONFIG_INET=n



Account for the configuration FIB_RULES=y && INET=n as FIB_RULES can
be selected by IPV6 or DECNET without INET.

Fixes: e7030878 ("fib: Add fib rule match on tunnel id")
Fixes: 3093fbe7 ("route: Per route IP tunnel metadata via lightweight tunnel")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3985e8a3

include/net/ip_tunnels.h

+15 −0

Original line number	Diff line number	Diff line
		@@ -314,6 +314,21 @@ static inline int ip_tunnel_collect_metadata(void)
		void ip_tunnel_need_metadata(void);
		void ip_tunnel_unneed_metadata(void);

		#else /* CONFIG_INET */

		static inline struct ip_tunnel_info lwt_tun_info(struct lwtunnel_state lwtstate)
		{
		return NULL;
		}

		static inline void ip_tunnel_need_metadata(void)
		{
		}

		static inline void ip_tunnel_unneed_metadata(void)
		{
		}

		#endif /* CONFIG_INET */

		#endif /* __NET_IP_TUNNELS_H */

Admin message