From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [PATCH] ip_tunnel: make ip6tunnel_xmit definition conditional Date: Mon, 04 Jan 2016 21:51:32 -0500 (EST) Message-ID: <20160104.215132.601618412229369596.davem@davemloft.net> References: <12586917.ah4bPMnYUH@wuerfel> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: pshelar@nicira.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kuznet@ms2.inr.ac.ru, jmorris@namei.org, yoshfuji@linux-ipv6.org, kaber@trash.net, linux-arm-kernel@lists.infradead.org To: arnd@arndb.de Return-path: In-Reply-To: <12586917.ah4bPMnYUH@wuerfel> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org From: Arnd Bergmann Date: Fri, 01 Jan 2016 14:48:59 +0100 > From 433df301cf49624871346fa63f3fc65033caeda3 Mon Sep 17 00:00:00 2001 > From: Arnd Bergmann > Date: Fri, 1 Jan 2016 13:18:48 +0100 > Subject: [PATCH] net: make ip6tunnel_xmit definition conditional > > Moving the caller of iptunnel_xmit_stats causes a build error in > randconfig builds that disable CONFIG_INET: > > In file included from ../net/xfrm/xfrm_input.c:17:0: > ../include/net/ip6_tunnel.h: In function 'ip6tunnel_xmit': > ../include/net/ip6_tunnel.h:93:2: error: implicit declaration of function 'iptunnel_xmit_stats' [-Werror=implicit-function-declaration] > iptunnel_xmit_stats(dev, pkt_len); > > The reason is that the iptunnel_xmit_stats definition is hidden > inside #ifdef CONFIG_INET but the caller is not. We can change > one or the other to fix it, and this patch adds a second #ifdef > around ip6tunnel_xmit() to avoid seeing the invalid call. > > Signed-off-by: Arnd Bergmann > Fixes: 039f50629b7f ("ip_tunnel: Move stats update to iptunnel_xmit()") Applied, thanks.