1 files changed, 6 insertions, 12 deletions

diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 3c277a4d0e78..26fa0cb78c94 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -33,16 +33,6 @@ static int xfrm_state_check_space(struct xfrm_state *x, struct sk_buff *skb)
         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;
-}
-
 static int xfrm_output_one(struct sk_buff *skb, int err)
 {
         struct dst_entry *dst = skb->dst;
@@ -52,12 +42,16 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
                 goto resume;
 
         do {
+                err = xfrm_state_check_space(x, skb);
+                if (err)
+                        goto error_nolock;
+
                 err = x->outer_mode->output(x, skb);
                 if (err)
-                        goto error;
+                        goto error_nolock;
 
                 spin_lock_bh(&x->lock);
-                err = xfrm_state_check(x, skb);
+                err = xfrm_state_check_expire(x);
                 if (err)
                         goto error;