openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jean Sacren 2013-06-01 16:23:15 +00:00 committed by David S. Miller
parent 6d75afe291
commit ebd4687af7
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/xfrm/xfrm_output.c
View File

@ -89,7 +89,7 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
err = x->type->output(x, skb); err = x->type->output(x, skb);
if (err == -EINPROGRESS) if (err == -EINPROGRESS)
goto out_exit; goto out;
resume: resume:
if (err) { if (err) {
@ -107,15 +107,14 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
x = dst->xfrm; x = dst->xfrm;
} while (x && !(x->outer_mode->flags & XFRM_MODE_FLAG_TUNNEL)); } while (x && !(x->outer_mode->flags & XFRM_MODE_FLAG_TUNNEL));
err = 0; return 0;
out_exit:
return err;
error: error:
spin_unlock_bh(&x->lock); spin_unlock_bh(&x->lock);
error_nolock: error_nolock:
kfree_skb(skb); kfree_skb(skb);
goto out_exit; out:
return err;
} }
int xfrm_output_resume(struct sk_buff *skb, int err) int xfrm_output_resume(struct sk_buff *skb, int err)