summaryrefslogtreecommitdiffstats
path: root/net/dccp/feat.c
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2008-09-04 07:30:19 +0200
committerGerrit Renker <gerrit@erg.abdn.ac.uk>2008-09-04 07:45:32 +0200
commit2faae5587f692fd5c79856ca4c4b90944ee0472a (patch)
tree637536dff5a15b5196233f38066644d19f77f23e /net/dccp/feat.c
parent4861a354430d2ea36847ef88086c7449b4f385b6 (diff)
downloadop-kernel-dev-2faae5587f692fd5c79856ca4c4b90944ee0472a.zip
op-kernel-dev-2faae5587f692fd5c79856ca4c4b90944ee0472a.tar.gz
dccp ccid-2: Use feature-negotiation to report Ack Ratio changes
This uses the new feature-negotiation framework to signal Ack Ratio changes, as required by RFC 4341, sec. 6.1.2. This raises some problems for CCID-2 since it can at the moment not cope gracefully with Ack Ratio of e.g. 2. A FIXME has thus been added which reverts to the existing policy of bypassing the Ack Ratio sysctl. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Diffstat (limited to 'net/dccp/feat.c')
-rw-r--r--net/dccp/feat.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/net/dccp/feat.c b/net/dccp/feat.c
index c847c80..f94c7c9 100644
--- a/net/dccp/feat.c
+++ b/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
OpenPOWER on IntegriCloud