diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2006-12-10 00:08:09 -0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-11 14:34:53 -0800 |
| commit | e312d100f19fdfe1019512b07a9d15653f254abf (patch) | |
| tree | 96b3275b746b2c871ab3d2d0f6e1d683ea0ae030 /net/dccp | |
| parent | 9f8681db961de6d75e43844e9664f1f81e05e1b7 (diff) | |
| download | kernel_samsung_smdk4412-e312d100f19fdfe1019512b07a9d15653f254abf.tar.gz kernel_samsung_smdk4412-e312d100f19fdfe1019512b07a9d15653f254abf.tar.bz2 kernel_samsung_smdk4412-e312d100f19fdfe1019512b07a9d15653f254abf.zip | |
[DCCP] ccid3: TX history - remove unused field
This removes the `dccphtx_ccval' field since it is nowhere used in the code and
in fact not necessary for the accounting.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Diffstat (limited to 'net/dccp')
| -rw-r--r-- | net/dccp/ccids/ccid3.c | 5 | ||||
| -rw-r--r-- | net/dccp/ccids/lib/packet_history.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c index 1a2ffa1d879..6bb3f8352da 100644 --- a/net/dccp/ccids/ccid3.c +++ b/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/net/dccp/ccids/lib/packet_history.h b/net/dccp/ccids/lib/packet_history.h index 9a8bcf224aa..4198185c6d4 100644 --- a/net/dccp/ccids/lib/packet_history.h +++ b/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; |