From fe47220c0287d16d4fda4493733e2cc9879804fb Mon Sep 17 00:00:00 2001 From: Gerrit Renker Date: Sat, 9 Dec 2006 23:59:14 -0200 Subject: [PATCH] --- yaml --- r: 44267 b: refs/heads/master c: 45393a66a2c30fc8ed86e6c79a63a3cd5231c69f h: refs/heads/master i: 44265: 93b69b529a4872ad1e9753f510685a5a6ffc1eb7 44263: 29e46626e43671a5bfd440651db924761a472fe3 v: v3 --- [refs] | 2 +- trunk/net/dccp/ccids/ccid3.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e6dcd4d5e1f0..25ab96adfbce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fce9a2da8a3b4ed088d9c0ac7c938a638044fdb +refs/heads/master: 45393a66a2c30fc8ed86e6c79a63a3cd5231c69f diff --git a/trunk/net/dccp/ccids/ccid3.c b/trunk/net/dccp/ccids/ccid3.c index 66a27b9688ca..f1b745ee9cb6 100644 --- a/trunk/net/dccp/ccids/ccid3.c +++ b/trunk/net/dccp/ccids/ccid3.c @@ -444,9 +444,9 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb) /* Update loss event rate */ pinv = opt_recv->ccid3or_loss_event_rate; - if (pinv == ~0U || pinv == 0) + if (pinv == ~0U || pinv == 0) /* see RFC 4342, 8.5 */ hctx->ccid3hctx_p = 0; - else + else /* can not exceed 100% */ hctx->ccid3hctx_p = 1000000 / pinv; dccp_timestamp(sk, &now); @@ -733,10 +733,15 @@ static void ccid3_hc_rx_send_feedback(struct sock *sk) /* Convert to multiples of 10us */ hcrx->ccid3hcrx_elapsed_time = timeval_delta(&now, &packet->dccphrx_tstamp) / 10; + if (hcrx->ccid3hcrx_p == 0) - hcrx->ccid3hcrx_pinv = ~0; - else + hcrx->ccid3hcrx_pinv = ~0U; /* see RFC 4342, 8.5 */ + else if (hcrx->ccid3hcrx_p > 1000000) { + DCCP_WARN("p (%u) > 100%%\n", hcrx->ccid3hcrx_p); + hcrx->ccid3hcrx_pinv = 1; /* use 100% in this case */ + } else hcrx->ccid3hcrx_pinv = 1000000 / hcrx->ccid3hcrx_p; + dp->dccps_hc_rx_insert_options = 1; dccp_send_ack(sk); }