diff options
| author | Lawrence Brakmo <brakmo@fb.com> | 2016-05-11 10:02:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-11 14:43:19 -0400 |
| commit | 756ee1729b2feb3a45767da29e338f70f2086ba3 (patch) | |
| tree | 9329409e197d2912d3fba7e247a57239996c99e9 /net/ipv4/tcp_bic.c | |
| parent | cf88585b1d5ce49515aabb381812976e2840a967 (diff) | |
| download | linux-stable-756ee1729b2feb3a45767da29e338f70f2086ba3.tar.gz linux-stable-756ee1729b2feb3a45767da29e338f70f2086ba3.tar.bz2 linux-stable-756ee1729b2feb3a45767da29e338f70f2086ba3.zip | |
tcp: replace cnt & rtt with struct in pkts_acked()
Replace 2 arguments (cnt and rtt) in the congestion control modules'
pkts_acked() function with a struct. This will allow adding more
information without having to modify existing congestion control
modules (tcp_nv in particular needs bytes in flight when packet
was sent).
As proposed by Neal Cardwell in his comments to the tcp_nv patch.
Signed-off-by: Lawrence Brakmo <brakmo@fb.com>
Acked-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_bic.c')
| -rw-r--r-- | net/ipv4/tcp_bic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_bic.c b/net/ipv4/tcp_bic.c index fd1405d37c14..36087bca9f48 100644 --- a/net/ipv4/tcp_bic.c +++ b/net/ipv4/tcp_bic.c @@ -197,15 +197,15 @@ static void bictcp_state(struct sock *sk, u8 new_state) /* Track delayed acknowledgment ratio using sliding window * ratio = (15*ratio + sample) / 16 */ -static void bictcp_acked(struct sock *sk, u32 cnt, s32 rtt) +static void bictcp_acked(struct sock *sk, const struct ack_sample *sample) { const struct inet_connection_sock *icsk = inet_csk(sk); if (icsk->icsk_ca_state == TCP_CA_Open) { struct bictcp *ca = inet_csk_ca(sk); - cnt -= ca->delayed_ack >> ACK_RATIO_SHIFT; - ca->delayed_ack += cnt; + ca->delayed_ack += sample->pkts_acked - + (ca->delayed_ack >> ACK_RATIO_SHIFT); } } |