Patchwork [net-next] ipv6: fix RFC5722 comment

login
register
mail settings
Submitter Eric Dumazet
Date Jan. 30, 2012, 2:29 p.m.
Message ID <1327933764.2288.42.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC>
Download mbox | patch
Permalink /patch/138583/
State Accepted
Delegated to: David Miller
Headers show

Comments

Eric Dumazet - Jan. 30, 2012, 2:29 p.m.
RFC5722 Section 4 was amended by Errata 3089

Our implementation did the right thing anyway...

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
 net/ipv6/reassembly.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Nicolas Dichtel - Jan. 30, 2012, 2:42 p.m.
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<eric.dumazet@gmail.com>
> Cc: Nicolas Dichtel<nicolas.dichtel@6wind.com>

Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
> ---
>   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

>   	 *   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. */
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Jan. 30, 2012, 5:59 p.m.
From: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
> Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com>

Applied, thanks Eric.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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. */