提交 7792cd88 编写于 作者: G Gerrit Renker 提交者: David S. Miller

[CCID2]: Remove unused variable

This removes a variable `ccid2hctx_sent' which is incremented but
never referenced/read (i.e., dead code).
Signed-off-by: NGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: NIan McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 900bfed4
...@@ -221,7 +221,6 @@ static void ccid2_hc_tx_rto_expire(unsigned long data) ...@@ -221,7 +221,6 @@ static void ccid2_hc_tx_rto_expire(unsigned long data)
hctx->ccid2hctx_seqt = hctx->ccid2hctx_seqh; hctx->ccid2hctx_seqt = hctx->ccid2hctx_seqh;
hctx->ccid2hctx_ssacks = 0; hctx->ccid2hctx_ssacks = 0;
hctx->ccid2hctx_acks = 0; hctx->ccid2hctx_acks = 0;
hctx->ccid2hctx_sent = 0;
/* clear ack ratio state. */ /* clear ack ratio state. */
hctx->ccid2hctx_rpseq = 0; hctx->ccid2hctx_rpseq = 0;
...@@ -285,8 +284,6 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len) ...@@ -285,8 +284,6 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)
ccid2_pr_debug("cwnd=%d pipe=%d\n", hctx->ccid2hctx_cwnd, ccid2_pr_debug("cwnd=%d pipe=%d\n", hctx->ccid2hctx_cwnd,
hctx->ccid2hctx_pipe); hctx->ccid2hctx_pipe);
hctx->ccid2hctx_sent++;
/* /*
* FIXME: The code below is broken and the variables have been removed * FIXME: The code below is broken and the variables have been removed
* from the socket struct. The `ackloss' variable was always set to 0, * 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,7 +514,6 @@ static inline void ccid2_new_ack(struct sock *sk,
ccid2_pr_debug("srtt: %ld rttvar: %ld rto: %ld (HZ=%d) R=%lu\n", ccid2_pr_debug("srtt: %ld rttvar: %ld rto: %ld (HZ=%d) R=%lu\n",
hctx->ccid2hctx_srtt, hctx->ccid2hctx_rttvar, hctx->ccid2hctx_srtt, hctx->ccid2hctx_rttvar,
hctx->ccid2hctx_rto, HZ, r); hctx->ccid2hctx_rto, HZ, r);
hctx->ccid2hctx_sent = 0;
} }
/* we got a new ack, so re-start RTO timer */ /* we got a new ack, so re-start RTO timer */
......
...@@ -42,7 +42,6 @@ struct ccid2_seq { ...@@ -42,7 +42,6 @@ struct ccid2_seq {
* *
* @ccid2hctx_ssacks - ACKs recv in slow start * @ccid2hctx_ssacks - ACKs recv in slow start
* @ccid2hctx_acks - ACKS recv in AI phase * @ccid2hctx_acks - ACKS recv in AI phase
* @ccid2hctx_sent - packets sent in this window
* @ccid2hctx_lastrtt -time RTT was last measured * @ccid2hctx_lastrtt -time RTT was last measured
* @ccid2hctx_rpseq - last consecutive seqno * @ccid2hctx_rpseq - last consecutive seqno
* @ccid2hctx_rpdupack - dupacks since rpseq * @ccid2hctx_rpdupack - dupacks since rpseq
...@@ -61,7 +60,6 @@ struct ccid2_hc_tx_sock { ...@@ -61,7 +60,6 @@ struct ccid2_hc_tx_sock {
long ccid2hctx_rto; long ccid2hctx_rto;
long ccid2hctx_srtt; long ccid2hctx_srtt;
long ccid2hctx_rttvar; long ccid2hctx_rttvar;
int ccid2hctx_sent;
unsigned long ccid2hctx_lastrtt; unsigned long ccid2hctx_lastrtt;
struct timer_list ccid2hctx_rtotimer; struct timer_list ccid2hctx_rtotimer;
u64 ccid2hctx_rpseq; u64 ccid2hctx_rpseq;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册