diff options
| author | David S. Miller <davem@davemloft.net> | 2019-12-31 13:37:13 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-12-31 13:37:13 -0800 |
| commit | 31d518f35e1a80268a24a855be9477eb458540ad (patch) | |
| tree | 28494f630aede8f95d4ed2ebbfd14c222bd24fa6 /net/ipv4/tcp_output.c | |
| parent | 9e860947d8d7a1504476ac49abfce90a4ce600f3 (diff) | |
| parent | 738d2902773e30939a982c8df7a7f94293659810 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Simple overlapping changes in bpf land wrt. bpf_helper_defs.h
handling.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 1f7735ca8f22..58c92a7d671c 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -72,6 +72,9 @@ static void tcp_event_new_data_sent(struct sock *sk, struct sk_buff *skb) __skb_unlink(skb, &sk->sk_write_queue); tcp_rbtree_insert(&sk->tcp_rtx_queue, skb); + if (tp->highest_sack == NULL) + tp->highest_sack = skb; + tp->packets_out += tcp_skb_pcount(skb); if (!prior_packets || icsk->icsk_pending == ICSK_TIME_LOSS_PROBE) tcp_rearm_rto(sk); |