From 7858445282ee180445ca35b7ee1be77fe8dac156 Mon Sep 17 00:00:00 2001 From: Gerrit Renker Date: Thu, 4 Sep 2008 07:30:19 +0200 Subject: [PATCH] --- yaml --- r: 111491 b: refs/heads/master c: 2faae5587f692fd5c79856ca4c4b90944ee0472a h: refs/heads/master i: 111489: 3448d1924e51a051a09b69a8b4cd737dc6f3297b 111487: 3f1f27b53efa4d22f9be66c52c4dc32e69ecf540 v: v3 --- [refs] | 2 +- trunk/net/dccp/feat.c | 12 ++++++++++++ trunk/net/dccp/proto.c | 1 - 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c32dcfbfb6b2..f198dc6eb687 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4861a354430d2ea36847ef88086c7449b4f385b6 +refs/heads/master: 2faae5587f692fd5c79856ca4c4b90944ee0472a diff --git a/trunk/net/dccp/feat.c b/trunk/net/dccp/feat.c index c847c80d1b97..f94c7c9d1a7f 100644 --- a/trunk/net/dccp/feat.c +++ b/trunk/net/dccp/feat.c @@ -74,6 +74,18 @@ static int dccp_hdlr_seq_win(struct sock *sk, u64 seq_win, bool rx) static int dccp_hdlr_ack_ratio(struct sock *sk, u64 ratio, bool rx) { +#ifndef __CCID2_COPES_GRACEFULLY_WITH_DYNAMIC_ACK_RATIO_UPDATES__ + /* + * FIXME: This is required until several problems in the CCID-2 code are + * resolved. The CCID-2 code currently does not cope well; using dynamic + * Ack Ratios greater than 1 caused instabilities. These were manifest + * in hangups and long RTO timeouts (1...3 seconds). Until this has been + * stabilised, it is safer not to activate dynamic Ack Ratio changes. + */ + dccp_pr_debug("Not changing %s Ack Ratio from 1 to %u\n", + rx ? "RX" : "TX", (u16)ratio); + ratio = 1; +#endif if (rx) dccp_sk(sk)->dccps_r_ack_ratio = ratio; else diff --git a/trunk/net/dccp/proto.c b/trunk/net/dccp/proto.c index 392a5d822b33..11905e0cf8f7 100644 --- a/trunk/net/dccp/proto.c +++ b/trunk/net/dccp/proto.c @@ -189,7 +189,6 @@ int dccp_init_sock(struct sock *sk, const __u8 ctl_sock_initialized) dp->dccps_rate_last = jiffies; dp->dccps_role = DCCP_ROLE_UNDEFINED; dp->dccps_service = DCCP_SERVICE_CODE_IS_ABSENT; - dp->dccps_l_ack_ratio = dp->dccps_r_ack_ratio = 1; dccp_init_xmit_timers(sk);