From: Jakub Kicinski Date: Thu, 20 Apr 2023 23:27:33 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=681c5b51dc6b8ff1ec05555243eccf64a08cb2fd;p=linux.git Merge git://git./linux/kernel/git/netdev/net Adjacent changes: net/mptcp/protocol.h 63740448a32e ("mptcp: fix accept vs worker race") 2a6a870e44dd ("mptcp: stops worker on unaccepted sockets at listener close") ddb1a072f858 ("mptcp: move first subflow allocation at mpc access time") Signed-off-by: Jakub Kicinski --- 681c5b51dc6b8ff1ec05555243eccf64a08cb2fd diff --cc net/mptcp/protocol.h index d91b852c2405d,d6469b6ab38e3..2d7b2c80a1641 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@@ -626,10 -629,12 +626,12 @@@ void mptcp_close_ssk(struct sock *sk, s struct mptcp_subflow_context *subflow); void __mptcp_subflow_send_ack(struct sock *ssk); void mptcp_subflow_reset(struct sock *ssk); + void mptcp_subflow_queue_clean(struct sock *sk, struct sock *ssk); void mptcp_sock_graft(struct sock *sk, struct socket *parent); -struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk); +struct socket *__mptcp_nmpc_socket(struct mptcp_sock *msk); bool __mptcp_close(struct sock *sk, long timeout); void mptcp_cancel_work(struct sock *sk); + void __mptcp_unaccepted_force_close(struct sock *sk); void mptcp_set_owner_r(struct sk_buff *skb, struct sock *sk); bool mptcp_addresses_equal(const struct mptcp_addr_info *a,