From 2a39cfd9a2378335bbf4b05545c839c2f68a3f2d Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 31 Jan 2012 21:45:26 +0000
Subject: [PATCH] --- yaml --- r: 289843 b: refs/heads/master c:
 5b11b2e4bdef20e839d90dce96c5bbeafaf9616c h: refs/heads/master i:   289841:
 cdaf4cac40b20589a5788b83ca6548b39114705d   289839:
 e72228226a2e75191e8241071d33e71001cc0352 v: v3

---
 [refs]                        | 2 +-
 trunk/net/ipv6/xfrm6_output.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6d01c0c3b225..4c9d66e73250 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8afca032998850ec63e83d555cdcf0eb5680cd6
+refs/heads/master: 5b11b2e4bdef20e839d90dce96c5bbeafaf9616c
diff --git a/trunk/net/ipv6/xfrm6_output.c b/trunk/net/ipv6/xfrm6_output.c
index 4eeff89c1aaa..8755a3079d0f 100644
--- a/trunk/net/ipv6/xfrm6_output.c
+++ b/trunk/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);