diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-09-15 16:47:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-16 09:07:01 -0700 |
| commit | fc22579917eb7e13433448a342f1cb1592920940 (patch) | |
| tree | ba6169aed222a8489aec0101804e96de41b76f57 /net | |
| parent | e67b8a685c7c984e834e3181ef4619cd7025a136 (diff) | |
| download | blackbird-op-linux-fc22579917eb7e13433448a342f1cb1592920940.tar.gz blackbird-op-linux-fc22579917eb7e13433448a342f1cb1592920940.zip | |
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')
| -rw-r--r-- | net/ipv4/tcp_output.c | 7 |
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, 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; } |
