]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
xfrm: remove unnecessary variable in xfrm_output_resume() 2nd try
authorJean-Christophe DUBOIS <jcd@tribudubois.net>
Wed, 13 Aug 2008 20:35:37 +0000 (13:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 Aug 2008 20:35:37 +0000 (13:35 -0700)
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>
net/xfrm/xfrm_output.c

index 3f964db908a71466e77949568d6ea672c63f281c..ac25b4c0e982ee7d5089f7cf5c41d6d73c39ab51 100644 (file)
@@ -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,