diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-12 14:04:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-12 14:04:26 -0500 |
| commit | 7c13a0d9a1ac6875f6380763b947f4a5a016605f (patch) | |
| tree | fbf7b41bc8cc250e6f9add13541e7d1c408a33b8 /net | |
| parent | 369cf77a6a3e41b1110506ddf43d45804103bfde (diff) | |
| parent | 22e091e5253da1e9ad7c0a82c2c84446fc403efe (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/netfilter/nf_conntrack_reasm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index 3a3f129a44cb..79d43aa8fa8d 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c | |||
| @@ -286,7 +286,7 @@ found: | |||
| 286 | 286 | ||
| 287 | /* Check for overlap with preceding fragment. */ | 287 | /* Check for overlap with preceding fragment. */ |
| 288 | if (prev && | 288 | if (prev && |
| 289 | (NFCT_FRAG6_CB(prev)->offset + prev->len) - offset > 0) | 289 | (NFCT_FRAG6_CB(prev)->offset + prev->len) > offset) |
| 290 | goto discard_fq; | 290 | goto discard_fq; |
| 291 | 291 | ||
| 292 | /* Look for overlap with succeeding segment. */ | 292 | /* Look for overlap with succeeding segment. */ |