From 895d568e981a948e25c54fd3f52a3f7c8c14ef11 Mon Sep 17 00:00:00 2001 From: Gerrit Renker Date: Sun, 10 Dec 2006 00:08:09 -0200 Subject: [PATCH] --- yaml --- r: 44281 b: refs/heads/master c: e312d100f19fdfe1019512b07a9d15653f254abf h: refs/heads/master i: 44279: fea6342bdcfb9c6134a41e480bdf44f499586044 v: v3 --- [refs] | 2 +- trunk/net/dccp/ccids/ccid3.c | 5 +++-- trunk/net/dccp/ccids/lib/packet_history.h | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 839e9284b9d7..7547f7db6aba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f8681db961de6d75e43844e9664f1f81e05e1b7 +refs/heads/master: e312d100f19fdfe1019512b07a9d15653f254abf diff --git a/trunk/net/dccp/ccids/ccid3.c b/trunk/net/dccp/ccids/ccid3.c index 1a2ffa1d8794..6bb3f8352dad 100644 --- a/trunk/net/dccp/ccids/ccid3.c +++ b/trunk/net/dccp/ccids/ccid3.c @@ -370,8 +370,9 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb) /* prepare to send now (add options etc.) */ dp->dccps_hc_tx_insert_options = 1; - new_packet->dccphtx_ccval = DCCP_SKB_CB(skb)->dccpd_ccval = - hctx->ccid3hctx_last_win_count; + DCCP_SKB_CB(skb)->dccpd_ccval = hctx->ccid3hctx_last_win_count; + + /* set the nominal send time for the next following packet */ timeval_add_usecs(&hctx->ccid3hctx_t_nom, hctx->ccid3hctx_t_ipi); return 0; diff --git a/trunk/net/dccp/ccids/lib/packet_history.h b/trunk/net/dccp/ccids/lib/packet_history.h index 9a8bcf224aa7..4198185c6d40 100644 --- a/trunk/net/dccp/ccids/lib/packet_history.h +++ b/trunk/net/dccp/ccids/lib/packet_history.h @@ -52,7 +52,6 @@ struct dccp_tx_hist_entry { struct list_head dccphtx_node; u64 dccphtx_seqno:48, - dccphtx_ccval:4, dccphtx_sent:1; u32 dccphtx_rtt; struct timeval dccphtx_tstamp;