diff options
| author |  Jakub Kicinski <kuba@kernel.org>
| 2023-06-01 15:33:03 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org>
| 2023-06-01 15:38:26 -0700 |
| commit | a03a91bd68cb00c615e602cf605e6be12bedaa90 (patch) | |
| tree | d26ef8bf5538d777498d6ef0fc6e4cc69475415b /include/net/tcp.h | |
| parent | Merge branch 'splice-net-handle-msg_splice_pages-in-chelsio-tls' (diff) | |
| parent | Merge tag 'net-6.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-a03a91bd68cb00c615e602cf605e6be12bedaa90.tar.gz linux-a03a91bd68cb00c615e602cf605e6be12bedaa90.tar.bz2 linux-a03a91bd68cb00c615e602cf605e6be12bedaa90.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Adjacent changes:
drivers/net/ethernet/sfc/tc.c
622ab656344a ("sfc: fix error unwinds in TC offload")
b6583d5e9e94 ("sfc: support TC decap rules matching on enc_src_port")
net/mptcp/protocol.c
5b825727d087 ("mptcp: add annotations around msk->subflow accesses")
e76c8ef5cc5b ("mptcp: refactor mptcp_stream_accept()")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/net/tcp.h')
| -rw-r--r-- | include/net/tcp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 14fa716cac50..68990a8f556a 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -628,6 +628,7 @@ void tcp_reset(struct sock *sk, struct sk_buff *skb); void tcp_skb_mark_lost_uncond_verify(struct tcp_sock *tp, struct sk_buff *skb); void tcp_fin(struct sock *sk); void tcp_check_space(struct sock *sk); +void tcp_sack_compress_send_ack(struct sock *sk); /* tcp_timer.c */ void tcp_init_xmit_timers(struct sock *); |