]> err.no Git - linux-2.6/commitdiff
[CCID3]: HC-receiver should not insert timestamps as HC-sender doesn't uses it
authorGerrit Renker <gerrit@erg.abdn.ac.uk>
Sat, 8 Dec 2007 18:26:59 +0000 (16:26 -0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2008 22:57:04 +0000 (14:57 -0800)
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>
net/dccp/ccids/ccid3.c

index bf95c3292d5b969f2640dab57ce3c6b95a74346c..f8644bfd88fb9c0958c1bb841a14b5fd08adca9a 100644 (file)
@@ -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)))