[v1] Squash to "mptcp: add sched in mptcp_sock"

[PATCH mptcp-next] Squash to "mptcp: add sched in mptcp_sock"

Geliang Tang posted 1 patch 2 years ago

Diff against v1
Download mbox

Failed in applying to current master (apply log)

There is a newer version of this series

net/mptcp/sched.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

Expand all Fold all

[PATCH mptcp-next] Squash to "mptcp: add sched in mptcp_sock"

Posted by Geliang Tang 2 years ago

Do nothing when msk->sched is NULL in mptcp_release_sched.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 net/mptcp/sched.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c
index 9b3a3157111d..3ce045a8739e 100644
--- a/net/mptcp/sched.c
+++ b/net/mptcp/sched.c
@@ -147,7 +147,10 @@ int mptcp_init_sched(struct mptcp_sock *msk,
 
 void mptcp_release_sched(struct mptcp_sock *msk)
 {
-	if (msk->sched && msk->sched->release)
+	if (!msk->sched)
+		return;
+
+	if (msk->sched->release)
 		msk->sched->release(msk);
 	bpf_module_put(msk->sched, msk->sched->owner);
 	msk->sched = NULL;
-- 
2.34.1