Skip to content

Commit

Permalink
ip_tunnel: Provide tunnel metadata API for CONFIG_INET=n
Browse files Browse the repository at this point in the history
Account for the configuration FIB_RULES=y && INET=n as FIB_RULES can
be selected by IPV6 or DECNET without INET.

Fixes: e703087 ("fib: Add fib rule match on tunnel id")
Fixes: 3093fbe ("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>
  • Loading branch information
Thomas Graf authored and David S. Miller committed Jul 22, 2015
1 parent 3985e8a commit 0528318
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions include/net/ip_tunnels.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit 0528318

Please sign in to comment.