Commit c1e24df2 authored by Jean-Christophe DUBOIS's avatar Jean-Christophe DUBOIS Committed by David S. Miller

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

Small fix removing an unnecessary intermediate variable.
Signed-off-by: default avatarJean-Christophe DUBOIS <jcd@tribudubois.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 36723873
...@@ -112,16 +112,13 @@ static int xfrm_output_one(struct sk_buff *skb, int err) ...@@ -112,16 +112,13 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment