diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2022-09-29 14:30:51 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-09-29 14:30:51 -0700 |
| commit | accc3b4a572bba903a801a393532272727f83f5b (patch) | |
| tree | b6677755ec43793d5719246f51e27f0e9d12b6c0 /net/mptcp/protocol.h | |
| parent | net: cpmac: Add __init/__exit annotations to module init/exit funcs (diff) | |
| parent | Merge tag 'net-6.0-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-dev-accc3b4a572bba903a801a393532272727f83f5b.tar.xz linux-dev-accc3b4a572bba903a801a393532272727f83f5b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/mptcp/protocol.h')
| -rw-r--r-- | net/mptcp/protocol.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index c1b12318535d..c0b5b4628f65 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -614,6 +614,8 @@ void mptcp_subflow_reset(struct sock *ssk); void mptcp_subflow_queue_clean(struct sock *ssk); void mptcp_sock_graft(struct sock *sk, struct socket *parent); struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk); +bool __mptcp_close(struct sock *sk, long timeout); +void mptcp_cancel_work(struct sock *sk); bool mptcp_addresses_equal(const struct mptcp_addr_info *a, const struct mptcp_addr_info *b, bool use_port); |