From bcdcac84765e850bd9c600eb1a5db95f6eceaaa5 Mon Sep 17 00:00:00 2001 From: Shan Wei Date: Fri, 12 Nov 2010 08:51:55 +0100 Subject: [PATCH] --- yaml --- r: 222034 b: refs/heads/master c: 22e091e5253da1e9ad7c0a82c2c84446fc403efe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e2cd03b65558..a78dd33e0d59 100644 --- 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 index 3a3f129a44cb..79d43aa8fa8d 100644 --- 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. */