Skip to content
Commit 9791d8e7 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 55c2bc14

 ("net: Cleanup encap items in ip_tunnels.h")
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b7e7ad61
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment