Re: [PATCH 1/2] ipv6: hide ip6_encap_hlen/ip6_tnl_encap definitions

From	David Miller <davem@davemloft.net>
Newsgroups	linux.kernel
Subject	Re: [PATCH 1/2] ipv6: hide ip6_encap_hlen/ip6_tnl_encap definitions
Date	2016-05-30 07:30 +0200
Message-ID	<rEnW2-8jz-19@gated-at.bofh.it> (permalink)
References	<rCIrU-2bQ-25@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 25 May 2016 16:50:45 +0200

> 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: 55c2bc143224 ("net: Cleanup encap items in ip_tunnels.h")

Applied.

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 1/2] ipv6: hide ip6_encap_hlen/ip6_tnl_encap definitions Arnd Bergmann <arnd@arndb.de> - 2016-05-25 17:00 +0200
  [PATCH 2/2] fou: add Kconfig options for IPv6 support Arnd Bergmann <arnd@arndb.de> - 2016-05-25 17:00 +0200
    Re: [PATCH 2/2] fou: add Kconfig options for IPv6 support David Miller <davem@davemloft.net> - 2016-05-30 07:30 +0200
  Re: [PATCH 1/2] ipv6: hide ip6_encap_hlen/ip6_tnl_encap definitions David Miller <davem@davemloft.net> - 2016-05-30 07:30 +0200

csiph-web