net: xfrm: fix old-style declaration (318d3cc0) · Commits · 戴 / test

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 <arnd@arndb.de> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/ipv4/xfrm4_policy.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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

net/ipv6/xfrm6_policy.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

Admin message