diff options
| author |   Thomas Graf <tgraf@suug.ch> | 2015-07-22 14:43:58 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-07-22 11:09:32 -0700 |
| commit | 052831879945be0d9fad2216b127147c565ec1b1 (patch) | |
| tree | e91103a0786daa2726781d189f36dd33e556a6f7 | |
| parent | ipv6: sysctl to restrict candidate source addresses (diff) | |
| download | linux-dev-052831879945be0d9fad2216b127147c565ec1b1.tar.xz linux-dev-052831879945be0d9fad2216b127147c565ec1b1.zip | |
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>
| -rw-r--r-- | include/net/ip_tunnels.h | 15 |
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) 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 */ |