diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-08 12:38:28 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-08 12:38:28 -0800 |
| commit | d0eaeec8e8dfdc31815941054802dcccd7c3fe1d (patch) | |
| tree | d7b0d172b7b9b3476c15e2cb001af2d4f8b6a39e /net/ipv6/reassembly.c | |
| parent | a7bcf21e60c73cb7f7c13fad928967d7e47c3cac (diff) | |
| parent | aa58163a76a3aef33c7220931543d45d0fe43753 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6/reassembly.c')
| -rw-r--r-- | net/ipv6/reassembly.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index c7ba3149633..0f276645375 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c @@ -349,7 +349,7 @@ found: /* Check for overlap with preceding fragment. */ if (prev && - (FRAG6_CB(prev)->offset + prev->len) - offset > 0) + (FRAG6_CB(prev)->offset + prev->len) > offset) goto discard_fq; /* Look for overlap with succeeding segment. */ |