From patchwork Fri Jan 1 13:48:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101225 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp3969152lbb; Fri, 1 Jan 2016 05:50:23 -0800 (PST) X-Received: by 10.98.11.209 with SMTP id 78mr82027607pfl.64.1451656223155; Fri, 01 Jan 2016 05:50:23 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ho5si40761332pad.175.2016.01.01.05.50.22; Fri, 01 Jan 2016 05:50:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752003AbcAANuB (ORCPT + 29 others); Fri, 1 Jan 2016 08:50:01 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:55607 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751692AbcAANt5 (ORCPT ); Fri, 1 Jan 2016 08:49:57 -0500 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue005) with ESMTPSA (Nemesis) id 0MLT3m-1aERqZ3NNi-000e4w; Fri, 01 Jan 2016 14:49:09 +0100 From: Arnd Bergmann To: Pravin B Shelar , "David S. Miller" , netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , linux-arm-kernel@lists.infradead.org Subject: [PATCH] ip_tunnel: make ip6tunnel_xmit definition conditional Date: Fri, 01 Jan 2016 14:48:59 +0100 Message-ID: <12586917.ah4bPMnYUH@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:Zrnww3TZq/kqHXn0tuDaaeX38gaCWKCvi6HAB3imG8qxBG9VF4/ trOQ5bHIcYfZUa5gSF1hPTeUaker8/xyRXeskfjeRHzzyeLKP6WrBp5llRoi4ZI7WOA0vJm HzRVqufONH6H+umqbxMKzZUBmAx4KevfCVPe561BhW25BWWqpXUwi3TyjHSviMt74Qdk1NZ 9jX24clXxtlaUFi0ETk9A== X-UI-Out-Filterresults: notjunk:1; V01:K0:6woijBc4WHo=:09lZJRzwm2ds+mDkUw7Aef bFaV4CLxNaRtA2vNN0pFkUAloXsEbLFg3P6v4q7vA6zJ3k3EKhMUtoEoUqNQKQldfvMMdCHSo FFkgJqPE7MurXEFaLDLzPiKP5skZzcd4g3P106xj3slhuWvBp4z7IBP1qEjFME/tI1rMHkdqO llkkicYKzlCx47baAyTzS5rkwmy0w7yvrjEy2yHKyZpoj9PEVhNVU9YlIWjEl1e10EatUnvcc CaLiWeV7pH8Q618F9OGIfTSrt1tIK9d47CWxCzj87JSr0+vCjlftzhyaXNvhwsfdSqiUlBfQh PfO9lHImrzyT6y5Dda56n1wL4KkwT3EZQ9xv1wE6N+I10dcy6VS3ujovaJ25T+j9oFTYJP4AU aENarF9n9f6OaAzHx7SvQQ1EDnjuNe2h3TXUYDhYD8C+kycZT9w9ErcquXoKz7Sg12NzF358g JumFLQNKpXy18/IFqD9ZNgsyNKm5DHnEsvMeZG5YDm0UxdeC+j/QqU/oQHljJPIg5wkfrMYm5 QVfz9IbMs7Ppl9BynjAD0fkJVw1bGHtY1QlpjPpCjLgD83KZ1dd37Dzim+4lP2v5oamGmar92 epzFfTz2HAGwLahVI3DWl8vVQg6kCZkgTCltYCXV6BrCHsEEzHg1CuU8+hQre2jhNgOuW6XKZ FOnXSz+CBJtXNyUeorS5pfCrZMVRtfZzKbANbNW6Qnd07WEhCEZm/oczh7PDGkcavFCS//dAb LnCEjA0zwtz/MCXl Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >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()") -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h index ae07e94778d8..0d0ce0b2d870 100644 --- a/include/net/ip6_tunnel.h +++ b/include/net/ip6_tunnel.h @@ -81,6 +81,7 @@ __u32 ip6_tnl_get_cap(struct ip6_tnl *t, const struct in6_addr *laddr, struct net *ip6_tnl_get_link_net(const struct net_device *dev); int ip6_tnl_get_iflink(const struct net_device *dev); +#ifdef CONFIG_INET static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb, struct net_device *dev) { @@ -93,3 +94,4 @@ static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb, iptunnel_xmit_stats(dev, pkt_len); } #endif +#endif