xfrm: simplify the exit path of xfrm_output_one()

Clean up unnecessary assignment and jump. While there, fix up the label
name.

Signed-off-by: Jean Sacren <sakiwit@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 0cf003dfa8fcd3d4f2f974f21649b164f76429b3..eb4a8428864879a1346fbd7895b4e5afaa4d91e3 100644 (file)
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -89,7 +89,7 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
 
                err = x->type->output(x, skb);
                if (err == -EINPROGRESS)
-                       goto out_exit;
+                       goto out;
 
 resume:
                if (err) {
@@ -107,15 +107,14 @@ resume:
                x = dst->xfrm;
        } while (x && !(x->outer_mode->flags & XFRM_MODE_FLAG_TUNNEL));
 
-       err = 0;
+       return 0;
 
-out_exit:
-       return err;
 error:
        spin_unlock_bh(&x->lock);
 error_nolock:
        kfree_skb(skb);
-       goto out_exit;
+out:
+       return err;
 }
 
 int xfrm_output_resume(struct sk_buff *skb, int err)