From 7a68dd1c8d01bc26c1b8bc9c1fb89e91b1ab9557 Mon Sep 17 00:00:00 2001 From: Jean-Christophe DUBOIS Date: Wed, 13 Aug 2008 13:35:37 -0700 Subject: [PATCH] --- yaml --- r: 108381 b: refs/heads/master c: c1e24df27fb1058739789126db6ad1b1ef719346 h: refs/heads/master i: 108379: 9b456ea036f741218d28a561944555174278a3f3 v: v3 --- [refs] | 2 +- trunk/net/xfrm/xfrm_output.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c25693b0b6df..b1e0264af739 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36723873b664fb6b5cfe06d291df948126e43f50 +refs/heads/master: c1e24df27fb1058739789126db6ad1b1ef719346 diff --git a/trunk/net/xfrm/xfrm_output.c b/trunk/net/xfrm/xfrm_output.c index 3f964db908a7..ac25b4c0e982 100644 --- a/trunk/net/xfrm/xfrm_output.c +++ b/trunk/net/xfrm/xfrm_output.c @@ -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) { while (likely((err = xfrm_output_one(skb, err)) == 0)) { - struct xfrm_state *x; - nf_reset(skb); err = skb->dst->ops->local_out(skb); if (unlikely(err != 1)) goto out; - x = skb->dst->xfrm; - if (!x) + if (!skb->dst->xfrm) return dst_output(skb); err = nf_hook(skb->dst->ops->family,