Merge branch 'linus' into tmp.x86.mpparse.new

[linux-2.6] / net / dccp / ccids / ccid2.h

diff --git a/net/dccp/ccids/ccid2.h b/net/dccp/ccids/ccid2.h
index b72e9556a1558b482acdce5330e1605d34d13edc..2c94ca0290107b1d464cb9938101969d4b135763 100644 (file)
--- a/net/dccp/ccids/ccid2.h
+++ b/net/dccp/ccids/ccid2.h
@@ -42,8 +42,8 @@ struct ccid2_seq {
 
 /** struct ccid2_hc_tx_sock - CCID2 TX half connection
  *
- * @ccid2hctx_ssacks - ACKs recv in slow start
- * @ccid2hctx_acks - ACKS recv in AI phase
+ * @ccid2hctx_{cwnd,ssthresh,pipe}: as per RFC 4341, section 5
+ * @ccid2hctx_packets_acked - Ack counter for deriving cwnd growth (RFC 3465)
  * @ccid2hctx_lastrtt -time RTT was last measured
  * @ccid2hctx_rpseq - last consecutive seqno
  * @ccid2hctx_rpdupack - dupacks since rpseq
@@ -51,9 +51,8 @@ struct ccid2_seq {
 struct ccid2_hc_tx_sock {
        u32                     ccid2hctx_cwnd;
        u32                     ccid2hctx_ssthresh;
-       int                     ccid2hctx_ssacks;
-       int                     ccid2hctx_acks;
-       int                     ccid2hctx_pipe;
+       u32                     ccid2hctx_pipe;
+       u32                     ccid2hctx_packets_acked;
        struct ccid2_seq        *ccid2hctx_seqbuf[CCID2_SEQBUF_MAX];
        int                     ccid2hctx_seqbufc;
        struct ccid2_seq        *ccid2hctx_seqh;
@@ -65,7 +64,6 @@ struct ccid2_hc_tx_sock {
        struct timer_list       ccid2hctx_rtotimer;
        u64                     ccid2hctx_rpseq;
        int                     ccid2hctx_rpdupack;
-       int                     ccid2hctx_sendwait;
        unsigned long           ccid2hctx_last_cong;
        u64                     ccid2hctx_high_ack;
 };