aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/ip_tunnels.h
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2015-07-22 08:43:58 -0400
committerDavid S. Miller <davem@davemloft.net>2015-07-22 14:09:32 -0400
commit052831879945be0d9fad2216b127147c565ec1b1 (patch)
treee91103a0786daa2726781d189f36dd33e556a6f7 /include/net/ip_tunnels.h
parent3985e8a3611a93bb36789f65db862e5700aab65e (diff)
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: e7030878fc84 ("fib: Add fib rule match on tunnel id") Fixes: 3093fbe7ff4b ("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>
Diffstat (limited to 'include/net/ip_tunnels.h')
-rw-r--r--include/net/ip_tunnels.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index 0a5a7763eec2..d975b3ebd6c7 100644
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -314,6 +314,21 @@ static inline int ip_tunnel_collect_metadata(void)
314void ip_tunnel_need_metadata(void); 314void ip_tunnel_need_metadata(void);
315void ip_tunnel_unneed_metadata(void); 315void ip_tunnel_unneed_metadata(void);
316 316
317#else /* CONFIG_INET */
318
319static inline struct ip_tunnel_info *lwt_tun_info(struct lwtunnel_state *lwtstate)
320{
321 return NULL;
322}
323
324static inline void ip_tunnel_need_metadata(void)
325{
326}
327
328static inline void ip_tunnel_unneed_metadata(void)
329{
330}
331
317#endif /* CONFIG_INET */ 332#endif /* CONFIG_INET */
318 333
319#endif /* __NET_IP_TUNNELS_H */ 334#endif /* __NET_IP_TUNNELS_H */