diff options
Diffstat (limited to 'net/dccp/ccids/ccid3.c')
-rw-r--r-- | net/dccp/ccids/ccid3.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c index b4cc62e2e2bb..eb1bda08eeb2 100644 --- a/net/dccp/ccids/ccid3.c +++ b/net/dccp/ccids/ccid3.c | |||
@@ -93,19 +93,16 @@ static inline u64 rfc3390_initial_rate(struct sock *sk) | |||
93 | return scaled_div(w_init << 6, hctx->rtt); | 93 | return scaled_div(w_init << 6, hctx->rtt); |
94 | } | 94 | } |
95 | 95 | ||
96 | /* | 96 | /** |
97 | * Recalculate t_ipi and delta (should be called whenever X changes) | 97 | * ccid3_update_send_interval - Calculate new t_ipi = s / X_inst |
98 | * This respects the granularity of X_inst (64 * bytes/second). | ||
98 | */ | 99 | */ |
99 | static void ccid3_update_send_interval(struct ccid3_hc_tx_sock *hctx) | 100 | static void ccid3_update_send_interval(struct ccid3_hc_tx_sock *hctx) |
100 | { | 101 | { |
101 | /* Calculate new t_ipi = s / X_inst (X_inst is in 64 * bytes/second) */ | ||
102 | hctx->t_ipi = scaled_div32(((u64)hctx->s) << 6, hctx->x); | 102 | hctx->t_ipi = scaled_div32(((u64)hctx->s) << 6, hctx->x); |
103 | 103 | ||
104 | /* Calculate new delta by delta = min(t_ipi / 2, t_gran / 2) */ | 104 | ccid3_pr_debug("t_ipi=%u, s=%u, X=%u\n", hctx->t_ipi, |
105 | hctx->delta = min_t(u32, hctx->t_ipi / 2, TFRC_OPSYS_HALF_TIME_GRAN); | 105 | hctx->s, (unsigned)(hctx->x >> 6)); |
106 | |||
107 | ccid3_pr_debug("t_ipi=%u, delta=%u, s=%u, X=%u\n", hctx->t_ipi, | ||
108 | hctx->delta, hctx->s, (unsigned)(hctx->x >> 6)); | ||
109 | } | 106 | } |
110 | 107 | ||
111 | static u32 ccid3_hc_tx_idle_rtt(struct ccid3_hc_tx_sock *hctx, ktime_t now) | 108 | static u32 ccid3_hc_tx_idle_rtt(struct ccid3_hc_tx_sock *hctx, ktime_t now) |
@@ -340,8 +337,8 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb) | |||
340 | * else | 337 | * else |
341 | * // send the packet in (t_nom - t_now) milliseconds. | 338 | * // send the packet in (t_nom - t_now) milliseconds. |
342 | */ | 339 | */ |
343 | if (delay - (s64)hctx->delta >= 1000) | 340 | if (delay >= TFRC_T_DELTA) |
344 | return (u32)delay / 1000L; | 341 | return (u32)delay / USEC_PER_MSEC; |
345 | 342 | ||
346 | ccid3_hc_tx_update_win_count(hctx, now); | 343 | ccid3_hc_tx_update_win_count(hctx, now); |
347 | break; | 344 | break; |