aboutsummaryrefslogtreecommitdiffstats
path: root/net/mptcp/sched.c
diff options
context:
space:
mode:
authorJakub Kicinski <[email protected]>2024-08-27 21:45:18 +0000
committerJakub Kicinski <[email protected]>2024-08-27 21:45:18 +0000
commit237c3851dc81f418ef735bb71ef482e126f78ea0 (patch)
tree663485498913e635295fd4aaf82c5e97a406c76c /net/mptcp/sched.c
parenttcp: fix forever orphan socket caused by tcp_abort (diff)
parentmptcp: pr_debug: add missing \n at the end (diff)
downloadkernel-237c3851dc81f418ef735bb71ef482e126f78ea0.tar.gz
kernel-237c3851dc81f418ef735bb71ef482e126f78ea0.zip
Merge branch 'mptcp-close-subflow-when-receiving-tcp-fin-and-misc'
Matthieu Baerts says: ==================== mptcp: close subflow when receiving TCP+FIN and misc. Here are different fixes: Patch 1 closes the subflow after having received a FIN, instead of leaving it half-closed until the end of the MPTCP connection. A fix for v5.12. Patch 2 validates the previous patch. Patch 3 is a fix for a recent fix to check both directions for the backup flag. It can follow the 'Fixes' commit and be backported up to v5.7. Patch 4 adds a missing \n at the end of pr_debug(), causing debug messages to be displayed with a delay, which confuses the debugger. A fix for v5.6. ==================== Link: https://patch.msgid.link/20240826-net-mptcp-close-extra-sf-fin-v1-0-905199fe1172@kernel.org Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'net/mptcp/sched.c')
-rw-r--r--net/mptcp/sched.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c
index 4a7fd0508ad2..78ed508ebc1b 100644
--- a/net/mptcp/sched.c
+++ b/net/mptcp/sched.c
@@ -86,7 +86,7 @@ int mptcp_register_scheduler(struct mptcp_sched_ops *sched)
list_add_tail_rcu(&sched->list, &mptcp_sched_list);
spin_unlock(&mptcp_sched_list_lock);
- pr_debug("%s registered", sched->name);
+ pr_debug("%s registered\n", sched->name);
return 0;
}
@@ -118,7 +118,7 @@ int mptcp_init_sched(struct mptcp_sock *msk,
if (msk->sched->init)
msk->sched->init(msk);
- pr_debug("sched=%s", msk->sched->name);
+ pr_debug("sched=%s\n", msk->sched->name);
return 0;
}