The variable has already been assigned in the subflow_create_ctx(),
So we don't need to reassign this variable in the subflow_ulp_clone().

Signed-off-by: MoYuanhao <moyuanhao3676@163.com>
---
 net/mptcp/subflow.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 07352b15f145..fd021cf8286e 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -2049,7 +2049,6 @@ static void subflow_ulp_clone(const struct request_sock *req,
 	new_ctx->tcp_state_change = old_ctx->tcp_state_change;
 	new_ctx->tcp_error_report = old_ctx->tcp_error_report;
 	new_ctx->rel_write_seq = 1;
-	new_ctx->tcp_sock = newsk;
 
 	if (subflow_req->mp_capable) {
 		/* see comments in subflow_syn_recv_sock(), MPTCP connection
-- 
2.25.1

Hi MoYuanhao, Netdev maintainers,

On 06/11/2024 08:10, MoYuanhao wrote:
> The variable has already been assigned in the subflow_create_ctx(),
> So we don't need to reassign this variable in the subflow_ulp_clone().

Good catch, no need to reassign it there.

Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>


I guess this patch is for net-next. Please next time clearly indicate
for which tree this patch is for, by adding this in the patch prefix:

  [PATCH net-next]

See: https://docs.kernel.org/process/maintainer-netdev.html

Also, please try to keep the patch title under ~50 chars.


@Netdev maintainers: is it OK for you to apply this small patch in
net-next directly?


Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

On Wed, 6 Nov 2024 16:41:10 +0100 Matthieu Baerts wrote:
> @Netdev maintainers: is it OK for you to apply this small patch in
> net-next directly?

Too soon for me to take it right now but yes.

Hi MoYuanhao,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal: Success! ✅
- KVM Validation: debug: Unstable: 1 failed test(s): mptcp_connect_mmap 🔴
- KVM Validation: btf-normal (only bpftest_all): Success! ✅
- KVM Validation: btf-debug (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/11699095104

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/4a7996ada8e4
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=906766


If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:

    $ cd [kernel source code]
    $ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
        --pull always mptcp/mptcp-upstream-virtme-docker:latest \
        auto-normal

For more details:

    https://github.com/multipath-tcp/mptcp-upstream-virtme-docker


Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)