---

yaml --- r: 108381 b: refs/heads/master c: c1e24df h: refs/heads/master i: 108379: 9b456ea v: v3
git-mirror · Aug 13, 2008 · 7a68dd1 · 7a68dd1
1 parent 3730687
commit 7a68dd1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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,