From patchwork Thu Jun 16 13:59:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102168 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp276191qgy; Thu, 16 Jun 2016 06:58:36 -0700 (PDT) X-Received: by 10.98.87.138 with SMTP id i10mr5323367pfj.1.1466085516522; Thu, 16 Jun 2016 06:58:36 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ut1si5449496pac.88.2016.06.16.06.58.36; Thu, 16 Jun 2016 06:58:36 -0700 (PDT) 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 S1754996AbcFPN6c (ORCPT + 30 others); Thu, 16 Jun 2016 09:58:32 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:65050 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754328AbcFPN6a (ORCPT ); Thu, 16 Jun 2016 09:58:30 -0400 Received: from wuerfel.localnet ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0LsNui-1bORuo31Wy-0120IN; Thu, 16 Jun 2016 15:58:14 +0200 From: Arnd Bergmann To: netdev@vger.kernel.org, Steffen Klassert , Herbert Xu , "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , David Ahern , linux-kernel@vger.kernel.org Subject: [PATCH 7/8] net: xfrm: fix old-style declaration Date: Thu, 16 Jun 2016 15:59:25 +0200 Message-ID: <12896147.Nph51CCL66@wuerfel> User-Agent: KMail/5.1.3 (Linux/4.4.0-22-generic; KDE/5.18.0; x86_64; ; ) In-Reply-To: <20160616135020.3154461-1-arnd@arndb.de> References: <20160616135020.3154461-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:n8a0hOPf5jGS/2bcz+laaP/yBmBoJuAWclAoj27jCDm00GZ6i5w 3u1wkkWbcNsqDr9CDngS/sMXcqu+snKtwbIS4hdnWz8clyc6yF4VjCdhslgFY7ma+RiVYMh hLDL/JO9lKP60+KcwDHhKhu6VlOIp0OLN0yY1pqOt2i8pp2c5Ge6zeDYopBh6hGIkHRnpTF +hyId3pZ5lBGJ5VfNBLIA== X-UI-Out-Filterresults: notjunk:1; V01:K0:v/v+6Oq2BjE=:SLIrYJTCUxaaKTimrTROx9 W4vXktp7r13YUtKX+6SswLny+tP6B6GTjFFauwkuPzZDm0YaLrQPGWM8+dICREDwe36HfvilY VVY/9RKwaDJX3bMY2zpINX92YkvvHYmauGc4qSktTYT9PmQQzZIjPiPSISAy039/0j88kPhnX 98e/J8SsSbaDIEWIRtdgcfAqnts4T4z/YaY8LQ5/lJFdeE1twOHY/sRCBjgX1zR5prsZkkbn/ tw2gMhfprMFOzBLNUtj/jEfVLQFwzJjVuquR0aIR8DutM87rSOwTMLZhCEVZwvEkeUUkJ7Oh2 4nty3Qj47pbsYdTeJJGBVdNDISbYot7ZZRlZbcZWMbWEY+jKWbCEDFE8OK1b11ZX0PhM0LKlk Emmhe6nMF8dnyoNqCAWrBkZU62EwsrP1HLEmOjkCT3w6C1W1LdeNl3lRIXtmX+ONAdMjejSPW ajHSF/dIk4pwkOQr2kdMyERx7/7oe2AdtggDcmOn+QRpDta9nKHqdz9w3De3zSx18HGjO/hFl z0J+YdkdM225oyW2ab9l+WpjukH1zptz54IFNzG2XwbRRP2uU6sT/29Wbao709CgHa8Ec5fem CJAZmhZPr+YICXLp5T2gf/FxbH2s6BfGfmSSQ5okCpBNnQGhJZrQLZZBF9uEFA8vpjA/WQazY u6Ti2jvuM21ywF5vR0DbGcDO49V8FEkbyuiVUedB/TIIXyXX0hFSA/EBE9Bmw0JtZ6nzpgh/t zDrsgM/da/aUx9/V Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Modern C standards expect the '__inline__' keyword to come before the return type in a declaration, and we get a couple of warnings for this with "make W=1" in the xfrm{4,6}_policy.c files: net/ipv6/xfrm6_policy.c:369:1: error: 'inline' is not at beginning of declaration [-Werror=old-style-declaration] static int inline xfrm6_net_sysctl_init(struct net *net) net/ipv6/xfrm6_policy.c:374:1: error: 'inline' is not at beginning of declaration [-Werror=old-style-declaration] static void inline xfrm6_net_sysctl_exit(struct net *net) net/ipv4/xfrm4_policy.c:339:1: error: 'inline' is not at beginning of declaration [-Werror=old-style-declaration] static int inline xfrm4_net_sysctl_init(struct net *net) net/ipv4/xfrm4_policy.c:344:1: error: 'inline' is not at beginning of declaration [-Werror=old-style-declaration] static void inline xfrm4_net_sysctl_exit(struct net *net) Signed-off-by: Arnd Bergmann --- net/ipv4/xfrm4_policy.c | 8 ++++---- net/ipv6/xfrm6_policy.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) -- 2.9.0 diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c index 7b0edb37a115..b644a23c3db0 100644 --- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c @@ -295,7 +295,7 @@ static struct ctl_table xfrm4_policy_table[] = { { } }; -static int __net_init xfrm4_net_sysctl_init(struct net *net) +static __net_init int xfrm4_net_sysctl_init(struct net *net) { struct ctl_table *table; struct ctl_table_header *hdr; @@ -323,7 +323,7 @@ err_alloc: return -ENOMEM; } -static void __net_exit xfrm4_net_sysctl_exit(struct net *net) +static __net_exit void xfrm4_net_sysctl_exit(struct net *net) { struct ctl_table *table; @@ -336,12 +336,12 @@ static void __net_exit xfrm4_net_sysctl_exit(struct net *net) kfree(table); } #else /* CONFIG_SYSCTL */ -static int inline xfrm4_net_sysctl_init(struct net *net) +static inline int xfrm4_net_sysctl_init(struct net *net) { return 0; } -static void inline xfrm4_net_sysctl_exit(struct net *net) +static inline void xfrm4_net_sysctl_exit(struct net *net) { } #endif diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index c074771a10f7..6cc97003e4a9 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c @@ -366,12 +366,12 @@ static void __net_exit xfrm6_net_sysctl_exit(struct net *net) kfree(table); } #else /* CONFIG_SYSCTL */ -static int inline xfrm6_net_sysctl_init(struct net *net) +static inline int xfrm6_net_sysctl_init(struct net *net) { return 0; } -static void inline xfrm6_net_sysctl_exit(struct net *net) +static inline void xfrm6_net_sysctl_exit(struct net *net) { } #endif