Merge branches 'audit', 'delay', 'fixes', 'misc' and 'sta2x11' into for-linus

[firefly-linux-kernel-4.4.55.git] / net / ipv6 / xfrm6_output.c

diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index 4eeff89c1aaa7d44d8b6369583b0b9e1c15317e9..8755a3079d0f3279255e54520fbfcdeb19a2006b 100644 (file)
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -146,7 +146,7 @@ static int __xfrm6_output(struct sk_buff *skb)
                return -EMSGSIZE;
        }
 
-       if ((x && x->props.mode == XFRM_MODE_TUNNEL) &&
+       if (x->props.mode == XFRM_MODE_TUNNEL &&
            ((skb->len > mtu && !skb_is_gso(skb)) ||
                dst_allfrag(skb_dst(skb)))) {
                        return ip6_fragment(skb, x->outer_mode->afinfo->output_finish);