aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/dccp/ccids/ccid2.c4
-rw-r--r--net/dccp/ccids/ccid2.h2
2 files changed, 0 insertions, 6 deletions
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
index a901202ada64..9fa0eb5f691b 100644
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -221,7 +221,6 @@ static void ccid2_hc_tx_rto_expire(unsigned long data)
221 hctx->ccid2hctx_seqt = hctx->ccid2hctx_seqh; 221 hctx->ccid2hctx_seqt = hctx->ccid2hctx_seqh;
222 hctx->ccid2hctx_ssacks = 0; 222 hctx->ccid2hctx_ssacks = 0;
223 hctx->ccid2hctx_acks = 0; 223 hctx->ccid2hctx_acks = 0;
224 hctx->ccid2hctx_sent = 0;
225 224
226 /* clear ack ratio state. */ 225 /* clear ack ratio state. */
227 hctx->ccid2hctx_rpseq = 0; 226 hctx->ccid2hctx_rpseq = 0;
@@ -285,8 +284,6 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)
285 ccid2_pr_debug("cwnd=%d pipe=%d\n", hctx->ccid2hctx_cwnd, 284 ccid2_pr_debug("cwnd=%d pipe=%d\n", hctx->ccid2hctx_cwnd,
286 hctx->ccid2hctx_pipe); 285 hctx->ccid2hctx_pipe);
287 286
288 hctx->ccid2hctx_sent++;
289
290 /* 287 /*
291 * FIXME: The code below is broken and the variables have been removed 288 * FIXME: The code below is broken and the variables have been removed
292 * from the socket struct. The `ackloss' variable was always set to 0, 289 * from the socket struct. The `ackloss' variable was always set to 0,
@@ -517,7 +514,6 @@ static inline void ccid2_new_ack(struct sock *sk,
517 ccid2_pr_debug("srtt: %ld rttvar: %ld rto: %ld (HZ=%d) R=%lu\n", 514 ccid2_pr_debug("srtt: %ld rttvar: %ld rto: %ld (HZ=%d) R=%lu\n",
518 hctx->ccid2hctx_srtt, hctx->ccid2hctx_rttvar, 515 hctx->ccid2hctx_srtt, hctx->ccid2hctx_rttvar,
519 hctx->ccid2hctx_rto, HZ, r); 516 hctx->ccid2hctx_rto, HZ, r);
520 hctx->ccid2hctx_sent = 0;
521 } 517 }
522 518
523 /* we got a new ack, so re-start RTO timer */ 519 /* we got a new ack, so re-start RTO timer */
diff --git a/net/dccp/ccids/ccid2.h b/net/dccp/ccids/ccid2.h
index ed95f8f0cc4a..6d0b4e32b161 100644
--- a/net/dccp/ccids/ccid2.h
+++ b/net/dccp/ccids/ccid2.h
@@ -42,7 +42,6 @@ struct ccid2_seq {
42 * 42 *
43 * @ccid2hctx_ssacks - ACKs recv in slow start 43 * @ccid2hctx_ssacks - ACKs recv in slow start
44 * @ccid2hctx_acks - ACKS recv in AI phase 44 * @ccid2hctx_acks - ACKS recv in AI phase
45 * @ccid2hctx_sent - packets sent in this window
46 * @ccid2hctx_lastrtt -time RTT was last measured 45 * @ccid2hctx_lastrtt -time RTT was last measured
47 * @ccid2hctx_rpseq - last consecutive seqno 46 * @ccid2hctx_rpseq - last consecutive seqno
48 * @ccid2hctx_rpdupack - dupacks since rpseq 47 * @ccid2hctx_rpdupack - dupacks since rpseq
@@ -61,7 +60,6 @@ struct ccid2_hc_tx_sock {
61 long ccid2hctx_rto; 60 long ccid2hctx_rto;
62 long ccid2hctx_srtt; 61 long ccid2hctx_srtt;
63 long ccid2hctx_rttvar; 62 long ccid2hctx_rttvar;
64 int ccid2hctx_sent;
65 unsigned long ccid2hctx_lastrtt; 63 unsigned long ccid2hctx_lastrtt;
66 struct timer_list ccid2hctx_rtotimer; 64 struct timer_list ccid2hctx_rtotimer;
67 u64 ccid2hctx_rpseq; 65 u64 ccid2hctx_rpseq;