---

yaml --- r: 222034 b: refs/heads/master c: 22e091e h: refs/heads/master v: v3
git-mirror · Nov 12, 2010 · bcdcac8 · bcdcac8
1 parent 45c5d4a
commit bcdcac8
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: ac5aa2e3332ec04889074afdbd1479424d0227a5
+refs/heads/master: 22e091e5253da1e9ad7c0a82c2c84446fc403efe
diff --git a/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c b/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -286,7 +286,7 @@ static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb,
 
 	/* Check for overlap with preceding fragment. */
 	if (prev &&
-	    (NFCT_FRAG6_CB(prev)->offset + prev->len) - offset > 0)
+	    (NFCT_FRAG6_CB(prev)->offset + prev->len) > offset)
 		goto discard_fq;
 
 	/* Look for overlap with succeeding segment. */