From 42b80139ac5b5c3d739d3d9979153c5d4866c71d Mon Sep 17 00:00:00 2001 From: Shan Wei Date: Fri, 5 Nov 2010 01:56:34 +0000 Subject: [PATCH] --- yaml --- r: 221994 b: refs/heads/master c: f46421416fb6b91513fb687d6503142cd99034a5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv6/reassembly.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 74eb08c48833..6ca29a437561 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c46ee52589a4edd67447214eb489b10fed5c53a +refs/heads/master: f46421416fb6b91513fb687d6503142cd99034a5 diff --git a/trunk/net/ipv6/reassembly.c b/trunk/net/ipv6/reassembly.c index c7ba3149633f..0f2766453759 100644 --- a/trunk/net/ipv6/reassembly.c +++ b/trunk/net/ipv6/reassembly.c @@ -349,7 +349,7 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb, /* 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. */