From 80bd205baee5b85c7e06a00c0f1d3aaf30623f30 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 30 Jan 2012 04:29:24 +0000 Subject: [PATCH] --- yaml --- r: 289827 b: refs/heads/master c: 5de658f878d49e952d7b3f3f26a396132829f513 h: refs/heads/master i: 289825: bd32278c0dd9c96f850d64cb487aab245d08df04 289823: 375c621b45d7bd6fa412c618d154be63298f0a9c v: v3 --- [refs] | 2 +- trunk/net/ipv6/reassembly.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 69c9519c2268..82a528a00404 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84920c1420e2b4a4150e5bb45ee5a23ea4641523 +refs/heads/master: 5de658f878d49e952d7b3f3f26a396132829f513 diff --git a/trunk/net/ipv6/reassembly.c b/trunk/net/ipv6/reassembly.c index b69fae76a6f1..9447bd69873a 100644 --- a/trunk/net/ipv6/reassembly.c +++ b/trunk/net/ipv6/reassembly.c @@ -336,12 +336,11 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb, } found: - /* RFC5722, Section 4: - * When reassembling an IPv6 datagram, if + /* RFC5722, Section 4, amended by Errata ID : 3089 + * When reassembling an IPv6 datagram, if * one or more its constituent fragments is determined to be an * overlapping fragment, the entire datagram (and any constituent - * fragments, including those not yet received) MUST be silently - * discarded. + * fragments) MUST be silently discarded. */ /* Check for overlap with preceding fragment. */