Commit 9791d8e7 authored May 25, 2016 by Arnd Bergmann Committed by David S. Miller May 29, 2016

ipv6: hide ip6_encap_hlen/ip6_tnl_encap definitions



A recent cleanup moved MAX_IPTUN_ENCAP_OPS along with some other
definitions, but it is now invisible when CONFIG_INET is
not defined, but still referenced from ip6_tunnel.h:

In file included from net/xfrm/xfrm_input.c:17:0:
include/net/ip6_tunnel.h:67:17: error: 'MAX_IPTUN_ENCAP_OPS' undeclared here (not in a function)
   ip6tun_encaps[MAX_IPTUN_ENCAP_OPS];
                 ^~~~~~~~~~~~~~~~~~~

This hides the ip6_encap_hlen and ip6_tnl_encap functions inside
of CONFIG_INET so we don't run into the the problem.

Alternatively we could move the macro out of the #ifdef again to
restore the previous behavior

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 55c2bc14 ("net: Cleanup encap items in ip_tunnels.h")
Signed-off-by: David S. Miller <davem@davemloft.net>

parent b7e7ad61

include/net/ip6_tunnel.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -63,6 +63,8 @@ struct ip6_tnl_encap_ops {
		u8 protocol, struct flowi6 fl6);
		};

		#ifdef CONFIG_INET

		extern const struct ip6_tnl_encap_ops __rcu *
		ip6tun_encaps[MAX_IPTUN_ENCAP_OPS];

		@@ -138,7 +140,6 @@ struct net ip6_tnl_get_link_net(const struct net_device dev);
		int ip6_tnl_get_iflink(const struct net_device *dev);
		int ip6_tnl_change_mtu(struct net_device *dev, int new_mtu);

		#ifdef CONFIG_INET
		static inline void ip6tunnel_xmit(struct sock sk, struct sk_buff skb,
		struct net_device *dev)
		{

Admin message