aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp
diff options
context:
space:
mode:
Diffstat (limited to 'net/dccp')
-rw-r--r--net/dccp/ccids/ccid3.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 52dae40bdffb..26ab73db2868 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -99,6 +99,11 @@ static inline void ccid3_update_send_time(struct ccid3_hc_tx_sock *hctx)
99 /* Calculate new delta by delta = min(t_ipi / 2, t_gran / 2) */ 99 /* Calculate new delta by delta = min(t_ipi / 2, t_gran / 2) */
100 hctx->ccid3hctx_delta = min_t(u32, hctx->ccid3hctx_t_ipi / 2, 100 hctx->ccid3hctx_delta = min_t(u32, hctx->ccid3hctx_t_ipi / 2,
101 TFRC_OPSYS_HALF_TIME_GRAN); 101 TFRC_OPSYS_HALF_TIME_GRAN);
102
103 ccid3_pr_debug("t_ipi=%u, delta=%u, s=%u, X=%llu\n",
104 hctx->ccid3hctx_t_ipi, hctx->ccid3hctx_delta,
105 hctx->ccid3hctx_s, hctx->ccid3hctx_x >> 6);
106
102} 107}
103/* 108/*
104 * Update X by 109 * Update X by
@@ -141,8 +146,13 @@ static void ccid3_hc_tx_update_x(struct sock *sk, struct timeval *now)
141 hctx->ccid3hctx_t_ld = *now; 146 hctx->ccid3hctx_t_ld = *now;
142 } 147 }
143 148
144 if (hctx->ccid3hctx_x != old_x) 149 if (hctx->ccid3hctx_x != old_x) {
150 ccid3_pr_debug("X_prev=%llu, X_now=%llu, X_calc=%u, "
151 "X_recv=%llu\n", old_x >> 6, hctx->ccid3hctx_x >> 6,
152 hctx->ccid3hctx_x_calc, hctx->ccid3hctx_x_recv >> 6);
153
145 ccid3_update_send_time(hctx); 154 ccid3_update_send_time(hctx);
155 }
146} 156}
147 157
148/* 158/*
@@ -339,6 +349,7 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
339 case TFRC_SSTATE_NO_FBACK: 349 case TFRC_SSTATE_NO_FBACK:
340 case TFRC_SSTATE_FBACK: 350 case TFRC_SSTATE_FBACK:
341 delay = timeval_delta(&hctx->ccid3hctx_t_nom, &now); 351 delay = timeval_delta(&hctx->ccid3hctx_t_nom, &now);
352 ccid3_pr_debug("delay=%ld\n", (long)delay);
342 /* 353 /*
343 * Scheduling of packet transmissions [RFC 3448, 4.6] 354 * Scheduling of packet transmissions [RFC 3448, 4.6]
344 * 355 *