Merge branch 'x86/amd-iommu' into x86/urgent

1 files changed, 1 insertions, 4 deletions

diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 3f964db908a7..ac25b4c0e982 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,