Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e312d100f19fdfe1019512b07a9d15653f254abf
Commit:     e312d100f19fdfe1019512b07a9d15653f254abf
Parent:     9f8681db961de6d75e43844e9664f1f81e05e1b7
Author:     Gerrit Renker <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 10 00:08:09 2006 -0200
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Dec 11 14:34:53 2006 -0800

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Ian McDonald <[EMAIL PROTECTED]>
    Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
---
 net/dccp/ccids/ccid3.c              |    5 +++--
 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 1a2ffa1..6bb3f83 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 9a8bcf2..4198185 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to