lkml.org 
[lkml]   [2016]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 62/70] tcp: convert cached rtt from usec to jiffies when feeding initial rto
    Date
    v3.19.8-ckt17 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>

    commit 9bdfb3b79e61c60e1a3e2dc05ad164528afa6b8a upstream.

    Currently it's converted into msecs, thus HZ=1000 intact.

    Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
    Fixes: 740b0f1841f6 ("tcp: switch rtt estimations to usec resolution")
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    net/ipv4/tcp_metrics.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c
    index ed9c9a9..c90e76c 100644
    --- a/net/ipv4/tcp_metrics.c
    +++ b/net/ipv4/tcp_metrics.c
    @@ -550,7 +550,7 @@ reset:
    */
    if (crtt > tp->srtt_us) {
    /* Set RTO like tcp_rtt_estimator(), but from cached RTT. */
    - crtt /= 8 * USEC_PER_MSEC;
    + crtt /= 8 * USEC_PER_SEC / HZ;
    inet_csk(sk)->icsk_rto = crtt + max(2 * crtt, tcp_rto_min(sk));
    } else if (tp->srtt_us == 0) {
    /* RFC6298: 5.7 We've failed to get a valid RTT sample from
    --
    2.7.0
    \
     
     \ /
      Last update: 2016-03-16 22:01    [W:2.818 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site