From f0d870eb1da31611477c1ec1ff8b2b075398b996 Mon Sep 17 00:00:00 2001 From: Gerrit Renker Date: Sat, 8 Dec 2007 16:26:59 -0200 Subject: [PATCH] --- yaml --- r: 78383 b: refs/heads/master c: 385ac2e3f226c09cb71733df1899658e33a7850f h: refs/heads/master i: 78381: 15c0455a3e9c17b7f285cd4d6c6e893f3dbccc94 78379: 251a255002400b88bc347adb2cde9ec9773e0123 78375: 663edf3e03054e995dccb4fc16a2af07cea8a72e 78367: 1c146da357724912bb1dc6283c7780f6cd018159 v: v3 --- [refs] | 2 +- trunk/net/dccp/ccids/ccid3.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6f0bf633de06..8bc0403f809d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 797eba424d4332f6aff5b741600b61e3d4b3d3f2 +refs/heads/master: 385ac2e3f226c09cb71733df1899658e33a7850f diff --git a/trunk/net/dccp/ccids/ccid3.c b/trunk/net/dccp/ccids/ccid3.c index bf95c3292d5b..f8644bfd88fb 100644 --- a/trunk/net/dccp/ccids/ccid3.c +++ b/trunk/net/dccp/ccids/ccid3.c @@ -750,8 +750,7 @@ static int ccid3_hc_rx_insert_options(struct sock *sk, struct sk_buff *skb) x_recv = htonl(hcrx->ccid3hcrx_x_recv); pinv = htonl(hcrx->ccid3hcrx_pinv); - if (dccp_insert_option_timestamp(sk, skb) || - dccp_insert_option(sk, skb, TFRC_OPT_LOSS_EVENT_RATE, + if (dccp_insert_option(sk, skb, TFRC_OPT_LOSS_EVENT_RATE, &pinv, sizeof(pinv)) || dccp_insert_option(sk, skb, TFRC_OPT_RECEIVE_RATE, &x_recv, sizeof(x_recv)))