diff options
| author | Jean Sacren <sakiwit@gmail.com> | 2013-06-01 18:23:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-05 00:17:38 +0200 |
| commit | ebd4687af732a903f6822bb129d2f3a7d830e798 (patch) | |
| tree | 36edb791d06c85a18c653bc1175fda68b98c175c /net/xfrm | |
| parent | ARM: dts: AM33XX: Add phy-mode to CPSW node (diff) | |
| download | linux-ebd4687af732a903f6822bb129d2f3a7d830e798.tar.xz linux-ebd4687af732a903f6822bb129d2f3a7d830e798.zip | |
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>
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_output.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index 0cf003dfa8fc..eb4a84288648 100644 --- 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) |