diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-05 09:41:36 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-05 09:41:36 +0300 |
| commit | f3391a160b22f8e006f3fb8ef39aa01da749fbf0 (patch) | |
| tree | 9a8f61fe1a3dd0d12e7511567b2344f80f5aa531 /include/net/tcp.h | |
| parent | d7847a7017b2a2759dd5590c0cffdbdf2994918e (diff) | |
| parent | 04974df8049fc4240d22759a91e035082ccd18b4 (diff) | |
| download | linux-f3391a160b22f8e006f3fb8ef39aa01da749fbf0.tar.xz | |
Merge tag 'v4.6-rc6' into x86/cpu, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/tcp.h')
| -rw-r--r-- | include/net/tcp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index b91370f61be6..6db10228113f 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -552,6 +552,8 @@ void tcp_send_ack(struct sock *sk); void tcp_send_delayed_ack(struct sock *sk); void tcp_send_loss_probe(struct sock *sk); bool tcp_schedule_loss_probe(struct sock *sk); +void tcp_skb_collapse_tstamp(struct sk_buff *skb, + const struct sk_buff *next_skb); /* tcp_input.c */ void tcp_resume_early_retransmit(struct sock *sk); |