Commit 92f74c1e authored by Davide Caratti's avatar Davide Caratti Committed by Paolo Abeni

mptcp: refer to 'MPTCP' socket in comments

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 5cdedad6
...@@ -2202,7 +2202,7 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, ...@@ -2202,7 +2202,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)) if (skb_queue_empty(&msk->receive_queue) && __mptcp_move_skbs(msk))
continue; 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() * conditions mirror closely tcp_recvmsg()
*/ */
if (copied >= target) if (copied >= target)
...@@ -3521,7 +3521,7 @@ void mptcp_subflow_process_delegated(struct sock *ssk, long status) ...@@ -3521,7 +3521,7 @@ void mptcp_subflow_process_delegated(struct sock *ssk, long status)
static int mptcp_hash(struct sock *sk) static int mptcp_hash(struct sock *sk)
{ {
/* should never be called, /* 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); WARN_ON_ONCE(1);
return 0; return 0;
......
...@@ -1719,7 +1719,7 @@ int mptcp_subflow_create_socket(struct sock *sk, unsigned short family, ...@@ -1719,7 +1719,7 @@ int mptcp_subflow_create_socket(struct sock *sk, unsigned short family,
mptcp_sockopt_sync_locked(mptcp_sk(sk), sf->sk); mptcp_sockopt_sync_locked(mptcp_sk(sk), sf->sk);
release_sock(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 * socket, even if for additional subflows the allocation is performed
* by a kernel workqueue. Adjust inode references, so that the * by a kernel workqueue. Adjust inode references, so that the
* procfs/diag interfaces really show this one belonging to the correct * procfs/diag interfaces really show this one belonging to the correct
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment