---

yaml --- r: 289843 b: refs/heads/master c: 5b11b2e h: refs/heads/master i: 289841: cdaf4ca 289839: e722282 v: v3
git-mirror · Feb 1, 2012 · 2a39cfd · 2a39cfd
1 parent dc243c6
commit 2a39cfd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);