summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerrit Renker2007-12-08 19:26:59 +0100
committerDavid S. Miller2008-01-28 23:57:04 +0100
commit385ac2e3f226c09cb71733df1899658e33a7850f (patch)
treed3b9754ec75c550b784ef51ab02b25e00aa70c34
parent[TFRC]: The function tfrc_rx_hist_entry_delete() is not used anymore (diff)
downloadkernel-qcow2-linux-385ac2e3f226c09cb71733df1899658e33a7850f.tar.gz
kernel-qcow2-linux-385ac2e3f226c09cb71733df1899658e33a7850f.tar.xz
kernel-qcow2-linux-385ac2e3f226c09cb71733df1899658e33a7850f.zip
[CCID3]: HC-receiver should not insert timestamps as HC-sender doesn't uses it
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/dccp/ccids/ccid3.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index bf95c3292d5b..f8644bfd88fb 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/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)))