aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_output.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2017-09-15 19:47:42 -0400
committerDavid S. Miller <davem@davemloft.net>2017-09-16 12:07:01 -0400
commitfc22579917eb7e13433448a342f1cb1592920940 (patch)
treeba6169aed222a8489aec0101804e96de41b76f57 /net/ipv4/tcp_output.c
parente67b8a685c7c984e834e3181ef4619cd7025a136 (diff)
tcp: fix data delivery rate
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>
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r--net/ipv4/tcp_output.c7
1 files 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,
1002 if (clone_it) { 1002 if (clone_it) {
1003 TCP_SKB_CB(skb)->tx.in_flight = TCP_SKB_CB(skb)->end_seq 1003 TCP_SKB_CB(skb)->tx.in_flight = TCP_SKB_CB(skb)->end_seq
1004 - tp->snd_una; 1004 - tp->snd_una;
1005 tcp_rate_skb_sent(sk, skb);
1006
1007 oskb = skb; 1005 oskb = skb;
1008 if (unlikely(skb_cloned(skb))) 1006 if (unlikely(skb_cloned(skb)))
1009 skb = pskb_copy(skb, gfp_mask); 1007 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,
1128 tcp_enter_cwr(sk); 1126 tcp_enter_cwr(sk);
1129 err = net_xmit_eval(err); 1127 err = net_xmit_eval(err);
1130 } 1128 }
1131 if (!err && oskb) 1129 if (!err && oskb) {
1132 oskb->skb_mstamp = tp->tcp_mstamp; 1130 oskb->skb_mstamp = tp->tcp_mstamp;
1133 1131 tcp_rate_skb_sent(sk, oskb);
1132 }
1134 return err; 1133 return err;
1135} 1134}
1136 1135