Commit 248fef78 authored by Davide Caratti's avatar Davide Caratti Committed by Gang Yan
Browse files

mptcp: refer to 'MPTCP' socket in comments 

mainline inclusion
from mainline-v6.11-rc1
commit 92f74c1e05b044b51398d6d4a85e659e4384f2cb
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VYQ9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=92f74c1e05b044b51398d6d4a85e659e4384f2cb



--------------------------------

We used to call it 'master' socket at the early stages of MPTCP
development, but the correct wording is 'MPTCP' socket opposed to 'TCP
subflows': convert the last 3 comments to use a more appropriate term.

Signed-off-by: default avatarDavide Caratti <dcaratti@redhat.com>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent ec0aff17

net/mptcp/protocol.c

+2 −2
Original line number Diff line number Diff line
@@ -2217,7 +2217,7 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, 
		if (skb_queue_empty(&msk->receive_queue) && __mptcp_move_skbs(msk))

			continue;



		/* only the master socket status is relevant here. The exit

		/* only the MPTCP socket status is relevant here. The exit

		 * conditions mirror closely tcp_recvmsg()

		 */

		if (copied >= target)
@@ -3548,7 +3548,7 @@ void mptcp_subflow_process_delegated(struct sock *ssk, long status) 
static int mptcp_hash(struct sock *sk)

{

	/* should never be called,

	 * we hash the TCP subflows not the master socket

	 * we hash the TCP subflows not the MPTCP socket

	 */

	WARN_ON_ONCE(1);

	return 0;

net/mptcp/subflow.c

+1 −1
Original line number Diff line number Diff line
@@ -1721,7 +1721,7 @@ int mptcp_subflow_create_socket(struct sock *sk, unsigned short family, 
	mptcp_sockopt_sync_locked(mptcp_sk(sk), sf->sk);

	release_sock(sf->sk);



	/* the newly created socket really belongs to the owning MPTCP master

	/* the newly created socket really belongs to the owning MPTCP

	 * socket, even if for additional subflows the allocation is performed

	 * by a kernel workqueue. Adjust inode references, so that the

	 * procfs/diag interfaces really show this one belonging to the correct