From: Eric Dumazet <edumazet@google.com>

Date: Fri, 15 Sep 2017 16:47:42 -0700

Subject: tcp: fix data delivery rate

Git-commit: fc22579917eb7e13433448a342f1cb1592920940

Patch-mainline: v4.14-rc1

References: networking-stable-17_10_09

Now skb->mstamp_skb is updated later, we also need to call

tcp_rate_skb_sent() after the update is done.

Fixes: 8c72c65b426b ("tcp: update skb->skb_mstamp more carefully")

Signed-off-by: Eric Dumazet <edumazet@google.com>

Acked-by: Soheil Hassas Yeganeh <soheil@google.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 net/ipv4/tcp_output.c | 7 +++----

 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c

index a85a8c2948e5..1c839c99114c 100644

--- a/net/ipv4/tcp_output.c

+++ b/net/ipv4/tcp_output.c

@@ -1002,8 +1002,6 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,

 	if (clone_it) {

 		TCP_SKB_CB(skb)->tx.in_flight = TCP_SKB_CB(skb)->end_seq

 			- tp->snd_una;

-		tcp_rate_skb_sent(sk, skb);

-

 		oskb = skb;

 		if (unlikely(skb_cloned(skb)))

 			skb = pskb_copy(skb, gfp_mask);

@@ -1128,9 +1126,10 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,

 		tcp_enter_cwr(sk);

 		err = net_xmit_eval(err);

 	}

-	if (!err && oskb)

+	if (!err && oskb) {

 		oskb->skb_mstamp = tp->tcp_mstamp;

-

+		tcp_rate_skb_sent(sk, oskb);

+	}

 	return err;

 }

-- 

2.17.1