aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2014-01-07 17:20:27 -0500
committerDavid S. Miller <davem@davemloft.net>2014-01-07 18:34:00 -0500
commitbe7928d20bab8517a0e38db2418394e8b2fd6a8e (patch)
tree9ee44649ea102d5fe4f6c4086833f173a4ca417c /net/xfrm
parent74b9c3ea847f060c784e86453f1ad77dd05a7a8f (diff)
net: xfrm: xfrm_policy: fix inline not at beginning of declaration
Fix three warnings related to: net/xfrm/xfrm_policy.c:1644:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration] net/xfrm/xfrm_policy.c:1656:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration] net/xfrm/xfrm_policy.c:1668:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration] Just removing the inline keyword is sufficient as the compiler will decide on its own about inlining or not. Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
-rw-r--r--net/xfrm/xfrm_policy.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index a7487f34e813..b39044631b0c 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1641,20 +1641,20 @@ free_dst:
1641 goto out; 1641 goto out;
1642} 1642}
1643 1643
1644static int inline 1644static int xfrm_dst_alloc_copy(void **target, const void *src, int size)
1645xfrm_dst_alloc_copy(void **target, const void *src, int size)
1646{ 1645{
1647 if (!*target) { 1646 if (!*target) {
1648 *target = kmalloc(size, GFP_ATOMIC); 1647 *target = kmalloc(size, GFP_ATOMIC);
1649 if (!*target) 1648 if (!*target)
1650 return -ENOMEM; 1649 return -ENOMEM;
1651 } 1650 }
1651
1652 memcpy(*target, src, size); 1652 memcpy(*target, src, size);
1653 return 0; 1653 return 0;
1654} 1654}
1655 1655
1656static int inline 1656static int xfrm_dst_update_parent(struct dst_entry *dst,
1657xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel) 1657 const struct xfrm_selector *sel)
1658{ 1658{
1659#ifdef CONFIG_XFRM_SUB_POLICY 1659#ifdef CONFIG_XFRM_SUB_POLICY
1660 struct xfrm_dst *xdst = (struct xfrm_dst *)dst; 1660 struct xfrm_dst *xdst = (struct xfrm_dst *)dst;
@@ -1665,8 +1665,8 @@ xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
1665#endif 1665#endif
1666} 1666}
1667 1667
1668static int inline 1668static int xfrm_dst_update_origin(struct dst_entry *dst,
1669xfrm_dst_update_origin(struct dst_entry *dst, const struct flowi *fl) 1669 const struct flowi *fl)
1670{ 1670{
1671#ifdef CONFIG_XFRM_SUB_POLICY 1671#ifdef CONFIG_XFRM_SUB_POLICY
1672 struct xfrm_dst *xdst = (struct xfrm_dst *)dst; 1672 struct xfrm_dst *xdst = (struct xfrm_dst *)dst;