From: Jean-Christophe DUBOIS <jcd@tribudubois.net>
Date: Wed, 13 Aug 2008 20:35:37 +0000 (-0700)
Subject: xfrm: remove unnecessary variable in xfrm_output_resume() 2nd try
X-Git-Tag: v2.6.27-rc4~103^2~31
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c1e24df27fb1058739789126db6ad1b1ef719346;p=linux-2.6-omap-h63xx.git

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

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>
---

diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 3f964db908a..ac25b4c0e98 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -112,16 +112,13 @@ error_nolock:
 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,