mptcp: sched: remove mptcp_sched_data

This is a follow-up of commit b68b106b0f15 ("mptcp: sched: reduce size
for unused data"), now removing the mptcp_sched_data structure.

Now is a good time to do that, because the previously mentioned WIP work
has been updated, no longer depending on this structure.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250413-net-next-mptcp-sched-mib-sft-misc-v2-1-0f83a4350150@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/mptcp.h b/include/net/mptcp.h
index bfbad69..f7263fe 100644 (file)
--- a/include/net/mptcp.h
+++ b/include/net/mptcp.h
@@ -101,18 +101,9 @@ struct mptcp_out_options {
 #define MPTCP_SCHED_MAX                128
 #define MPTCP_SCHED_BUF_MAX    (MPTCP_SCHED_NAME_MAX * MPTCP_SCHED_MAX)
 
-#define MPTCP_SUBFLOWS_MAX     8
-
-struct mptcp_sched_data {
-       u8      subflows;
-       struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX];
-};
-
 struct mptcp_sched_ops {
-       int (*get_send)(struct mptcp_sock *msk,
-                       struct mptcp_sched_data *data);
-       int (*get_retrans)(struct mptcp_sock *msk,
-                          struct mptcp_sched_data *data);
+       int (*get_send)(struct mptcp_sock *msk);
+       int (*get_retrans)(struct mptcp_sock *msk);
 
        char                    name[MPTCP_SCHED_NAME_MAX];
        struct module           *owner;

diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c
index c16c6fb..f09f7eb 100644 (file)
--- a/net/mptcp/sched.c
+++ b/net/mptcp/sched.c
@@ -16,8 +16,7 @@
 static DEFINE_SPINLOCK(mptcp_sched_list_lock);
 static LIST_HEAD(mptcp_sched_list);
 
-static int mptcp_sched_default_get_send(struct mptcp_sock *msk,
-                                       struct mptcp_sched_data *data)
+static int mptcp_sched_default_get_send(struct mptcp_sock *msk)
 {
        struct sock *ssk;
 
@@ -29,8 +28,7 @@ static int mptcp_sched_default_get_send(struct mptcp_sock *msk,
        return 0;
 }
 
-static int mptcp_sched_default_get_retrans(struct mptcp_sock *msk,
-                                          struct mptcp_sched_data *data)
+static int mptcp_sched_default_get_retrans(struct mptcp_sock *msk)
 {
        struct sock *ssk;
 
@@ -157,7 +155,6 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow,
 int mptcp_sched_get_send(struct mptcp_sock *msk)
 {
        struct mptcp_subflow_context *subflow;
-       struct mptcp_sched_data *data = NULL;
 
        msk_owned_by_me(msk);
 
@@ -178,14 +175,13 @@ int mptcp_sched_get_send(struct mptcp_sock *msk)
        }
 
        if (msk->sched == &mptcp_sched_default || !msk->sched)
-               return mptcp_sched_default_get_send(msk, data);
-       return msk->sched->get_send(msk, data);
+               return mptcp_sched_default_get_send(msk);
+       return msk->sched->get_send(msk);
 }
 
 int mptcp_sched_get_retrans(struct mptcp_sock *msk)
 {
        struct mptcp_subflow_context *subflow;
-       struct mptcp_sched_data *data = NULL;
 
        msk_owned_by_me(msk);
 
@@ -199,8 +195,8 @@ int mptcp_sched_get_retrans(struct mptcp_sock *msk)
        }
 
        if (msk->sched == &mptcp_sched_default || !msk->sched)
-               return mptcp_sched_default_get_retrans(msk, data);
+               return mptcp_sched_default_get_retrans(msk);
        if (msk->sched->get_retrans)
-               return msk->sched->get_retrans(msk, data);
-       return msk->sched->get_send(msk, data);
+               return msk->sched->get_retrans(msk);
+       return msk->sched->get_send(msk);
 }