---

yaml --- r: 289827 b: refs/heads/master c: 5de658f h: refs/heads/master i: 289825: bd32278 289823: 375c621 v: v3
git-mirror · Jan 30, 2012 · 80bd205 · 80bd205
1 parent 8834624
commit 80bd205
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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. */