A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

net: xfrm: fix old-style declaration

Browse source 
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
Arnd Bergmann 2016-06-16 15:59:25 +02:00 • committed by David S. Miller
commit 318d3cc04e
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
net/ipv4/xfrm4_policy.c
View file

@ -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