ipv6: fix RFC5722 comment

Started by Eric Dumazet on Jan 30, 2012 · 3 messages from 3 authors · Last reply Jan 30, 2012

Subsystems (3)

Maintainers (7)

Show 3 more
STALE5398d

open the first message on its own page

Message details and related content
RFC5722 Section 4 was amended by Errata 3089

Our implementation did the right thing anyway...

Signed-off-by: Eric Dumazet <redacted>
Cc: Nicolas Dichtel <redacted>
---
 net/ipv6/reassembly.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index b69fae7..9447bd6 100644
--- a/net/ipv6/reassembly.c
+++ b/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. */
Message details and related content
Le 30/01/2012 15:29, Eric Dumazet a écrit :
RFC5722 Section 4 was amended by Errata 3089

Our implementation did the right thing anyway...

Signed-off-by: Eric Dumazet<redacted>
Cc: Nicolas Dichtel<redacted>
Acked-by: Nicolas Dichtel <redacted>
quoted hunk
---
  net/ipv6/reassembly.c |    7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index b69fae7..9447bd6 100644
--- a/net/ipv6/reassembly.c
+++ b/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
Identation was an exact copy of the original rfc (not changed by the errata), but it's a detail ;-)


Regards,
Nicolas
quoted hunk
  	 *   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. */
Message details and related content
From: Eric Dumazet <redacted>
Date: Mon, 30 Jan 2012 15:29:24 +0100
RFC5722 Section 4 was amended by Errata 3089

Our implementation did the right thing anyway...

Signed-off-by: Eric Dumazet <redacted>
Cc: Nicolas Dichtel <redacted>
Applied, thanks Eric.
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help