diff for duplicates of <200609141644.32243@strip-the-willow> diff --git a/a/1.txt b/N1/1.txt index 5fddbc7..0f18eee 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -217,8 +217,7 @@ index 7f56f7e..8137e82 100644 * DCCP-Sync packets are the best choice for upward * probing, since DCCP-Sync probes do not risk application @@ -730,7 +730,7 @@ static void dccp_v4_ctl_send_reset(struc - dccp_hdr_reset(skb)->dccph_reset_code = - DCCP_SKB_CB(rxskb)->dccpd_reset_code; + dccp_hdr_reset(skb)->dccph_reset_code DCCP_SKB_CB(rxskb)->dccpd_reset_code; - /* See "8.3.1. Abnormal Termination" in draft-ietf-dccp-spec-11 */ + /* See "8.3.1. Abnormal Termination" in RFC 4340 */ @@ -230,8 +229,7 @@ index 610c722..36995e6 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -547,7 +547,7 @@ static void dccp_v6_ctl_send_reset(struc - dccp_hdr_reset(skb)->dccph_reset_code = - DCCP_SKB_CB(rxskb)->dccpd_reset_code; + dccp_hdr_reset(skb)->dccph_reset_code DCCP_SKB_CB(rxskb)->dccpd_reset_code; - /* See "8.3.1. Abnormal Termination" in draft-ietf-dccp-spec-11 */ + /* See "8.3.1. Abnormal Termination" in RFC 4340 */ @@ -293,7 +291,7 @@ Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> - * in draft-ietf-dccp-spec-11. -acme + * in RFC 4340 -acme */ - if (sk->sk_state == DCCP_CLOSING) { + if (sk->sk_state = DCCP_CLOSING) { /* FIXME: should start at 2 * RTT */ diff --git a/net/dccp/timer.c b/net/dccp/timer.c index 8447742..391c921 100644 @@ -301,8 +299,7 @@ index 8447742..391c921 100644 +++ b/net/dccp/timer.c @@ -49,12 +49,11 @@ static int dccp_write_timeout(struct soc } else { - if (icsk->icsk_retransmits >= - /* FIXME! sysctl_tcp_retries1 */ 5 /* FIXME! */) { + if (icsk->icsk_retransmits > /* FIXME! sysctl_tcp_retries1 */ 5 /* FIXME! */) { - /* NOTE. draft-ietf-tcpimpl-pmtud-01.txt requires pmtu - black hole detection. :-( + /* NOTE. RFC 2923 requires pmtu black hole detection. :-( diff --git a/a/content_digest b/N1/content_digest index a96a99b..ab7c515 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,7 @@ "From\0Gerrit Renker <gerrit@erg.abdn.ac.uk>\0" "Subject\0[PATCH 2.6.17][Trivial] net/dccp: update references to standards\0" - "Date\0Thu, 14 Sep 2006 16:44:32 +0100\0" - "To\0davem@davemloft.net" - " netdev@vger.kernel.org\0" - "Cc\0dccp@vger.kernel.org\0" + "Date\0Thu, 14 Sep 2006 15:44:32 +0000\0" + "To\0dccp@vger.kernel.org\0" "\00:1\0" "b\0" "[DCCP]: Update documentation references.\n" @@ -225,8 +223,7 @@ " \t\t *\tDCCP-Sync packets are the best choice for upward\n" " \t\t *\tprobing, since DCCP-Sync probes do not risk application\n" "@@ -730,7 +730,7 @@ static void dccp_v4_ctl_send_reset(struc\n" - " \tdccp_hdr_reset(skb)->dccph_reset_code =\n" - " \t\t\t\tDCCP_SKB_CB(rxskb)->dccpd_reset_code;\n" + " \tdccp_hdr_reset(skb)->dccph_reset_code \t\t\t\tDCCP_SKB_CB(rxskb)->dccpd_reset_code;\n" " \n" "-\t/* See \"8.3.1. Abnormal Termination\" in draft-ietf-dccp-spec-11 */\n" "+\t/* See \"8.3.1. Abnormal Termination\" in RFC 4340 */\n" @@ -238,8 +235,7 @@ "--- a/net/dccp/ipv6.c\n" "+++ b/net/dccp/ipv6.c\n" "@@ -547,7 +547,7 @@ static void dccp_v6_ctl_send_reset(struc\n" - " \tdccp_hdr_reset(skb)->dccph_reset_code =\n" - " \t\t\t\tDCCP_SKB_CB(rxskb)->dccpd_reset_code;\n" + " \tdccp_hdr_reset(skb)->dccph_reset_code \t\t\t\tDCCP_SKB_CB(rxskb)->dccpd_reset_code;\n" " \n" "-\t/* See \"8.3.1. Abnormal Termination\" in draft-ietf-dccp-spec-11 */\n" "+\t/* See \"8.3.1. Abnormal Termination\" in RFC 4340 */\n" @@ -301,7 +297,7 @@ "-\t * in draft-ietf-dccp-spec-11. -acme\n" "+\t * in RFC 4340 -acme\n" " \t */\n" - " \tif (sk->sk_state == DCCP_CLOSING) {\n" + " \tif (sk->sk_state = DCCP_CLOSING) {\n" " \t\t/* FIXME: should start at 2 * RTT */\n" "diff --git a/net/dccp/timer.c b/net/dccp/timer.c\n" "index 8447742..391c921 100644\n" @@ -309,8 +305,7 @@ "+++ b/net/dccp/timer.c\n" "@@ -49,12 +49,11 @@ static int dccp_write_timeout(struct soc\n" " \t} else {\n" - " \t\tif (icsk->icsk_retransmits >=\n" - " \t\t /* FIXME! sysctl_tcp_retries1 */ 5 /* FIXME! */) {\n" + " \t\tif (icsk->icsk_retransmits > \t\t /* FIXME! sysctl_tcp_retries1 */ 5 /* FIXME! */) {\n" "-\t\t\t/* NOTE. draft-ietf-tcpimpl-pmtud-01.txt requires pmtu\n" "-\t\t\t black hole detection. :-(\n" "+\t\t\t/* NOTE. RFC 2923 requires pmtu black hole detection. :-(\n" @@ -336,4 +331,4 @@ " * 1. It is independent of path mtu.\n" * 2. Ideally, it is maximal possible segment size i.e. 65535-40. -033a156ae3c9d14749bf1405dae8c36e66b078397285e28a046c6943ac94426b +b0d7597bef691b7b80fea488be197626ada6a4a7de416132612cf84c599ad676
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.