Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 13:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfrm: remove unnecessary variable in xfrm_output_resume() 2nd try

Browse Source 
Small fix removing an unnecessary intermediate variable.

Signed-off-by: Jean-Christophe DUBOIS <jcd@tribudubois.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jean-Christophe DUBOIS 2008-08-13 13:35:37 -07:00 committed by David S. Miller
parent 36723873b6
commit c1e24df27f
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/xfrm/xfrm_output.c
View File

@ -112,16 +112,13 @@ error_nolock:
int xfrm_output_resume(struct sk_buff *skb, int err) int xfrm_output_resume(struct sk_buff *skb, int err)
{ {
while (likely((err = xfrm_output_one(skb, err)) == 0)) { while (likely((err = xfrm_output_one(skb, err)) == 0)) {
struct xfrm_state *x;
nf_reset(skb); nf_reset(skb);
err = skb->dst->ops->local_out(skb); err = skb->dst->ops->local_out(skb);
if (unlikely(err != 1)) if (unlikely(err != 1))
goto out; goto out;
x = skb->dst->xfrm; if (!skb->dst->xfrm)
if (!x)
return dst_output(skb); return dst_output(skb);
err = nf_hook(skb->dst->ops->family, err = nf_hook(skb->dst->ops->family,