[IPSEC]: Move xfrm_state_check into xfrm_output.c

The functions xfrm_state_check and xfrm_state_check_space are only used by
the output code in xfrm_output.c so we can move them over.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 22 insertions, 23 deletions

diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 75f289b488a7..5b1c978a323c 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -18,6 +18,28 @@
 #include <net/dst.h>
 #include <net/xfrm.h>
 
+static int xfrm_state_check_space(struct xfrm_state *x, struct sk_buff *skb)
+{
+        int nhead = x->props.header_len + LL_RESERVED_SPACE(skb->dst->dev)
+                - skb_headroom(skb);
+
+        if (nhead > 0)
+                return pskb_expand_head(skb, nhead, 0, GFP_ATOMIC);
+
+        /* Check tail too... */
+        return 0;
+}
+
+static int xfrm_state_check(struct xfrm_state *x, struct sk_buff *skb)
+{
+        int err = xfrm_state_check_expire(x);
+        if (err < 0)
+                goto err;
+        err = xfrm_state_check_space(x, skb);
+err:
+        return err;
+}
+
 int xfrm_output(struct sk_buff *skb)
 {
         struct dst_entry *dst = skb->dst;
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 15734adc9367..0ecec34d265a 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1152,29 +1152,6 @@ int xfrm_state_check_expire(struct xfrm_state *x)
 }
 EXPORT_SYMBOL(xfrm_state_check_expire);
 
-static int xfrm_state_check_space(struct xfrm_state *x, struct sk_buff *skb)
-{
-        int nhead = x->props.header_len + LL_RESERVED_SPACE(skb->dst->dev)
-                - skb_headroom(skb);
-
-        if (nhead > 0)
-                return pskb_expand_head(skb, nhead, 0, GFP_ATOMIC);
-
-        /* Check tail too... */
-        return 0;
-}
-
-int xfrm_state_check(struct xfrm_state *x, struct sk_buff *skb)
-{
-        int err = xfrm_state_check_expire(x);
-        if (err < 0)
-                goto err;
-        err = xfrm_state_check_space(x, skb);
-err:
-        return err;
-}
-EXPORT_SYMBOL(xfrm_state_check);
-
 struct xfrm_state *
 xfrm_state_lookup(xfrm_address_t *daddr, __be32 spi, u8 proto,
                   unsigned short family)