tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Matthieu Baerts (NGI0) and committed by
Jakub Kicinski 6e83166d f15e4106

+9 -22
+2 -11
include/net/mptcp.h
··· 101 101 #define MPTCP_SCHED_MAX 128 102 102 #define MPTCP_SCHED_BUF_MAX (MPTCP_SCHED_NAME_MAX * MPTCP_SCHED_MAX) 103 103 104 - #define MPTCP_SUBFLOWS_MAX 8 105 - 106 - struct mptcp_sched_data { 107 - u8 subflows; 108 - struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; 109 - }; 110 - 111 104 struct mptcp_sched_ops { 112 - int (*get_send)(struct mptcp_sock *msk, 113 - struct mptcp_sched_data *data); 114 - int (*get_retrans)(struct mptcp_sock *msk, 115 - struct mptcp_sched_data *data); 105 + int (*get_send)(struct mptcp_sock *msk); 106 + int (*get_retrans)(struct mptcp_sock *msk); 116 107 117 108 char name[MPTCP_SCHED_NAME_MAX]; 118 109 struct module *owner;
+7 -11
net/mptcp/sched.c
··· 16 16 static DEFINE_SPINLOCK(mptcp_sched_list_lock); 17 17 static LIST_HEAD(mptcp_sched_list); 18 18 19 - static int mptcp_sched_default_get_send(struct mptcp_sock *msk, 20 - struct mptcp_sched_data *data) 19 + static int mptcp_sched_default_get_send(struct mptcp_sock *msk) 21 20 { 22 21 struct sock *ssk; 23 22 ··· 28 29 return 0; 29 30 } 30 31 31 - static int mptcp_sched_default_get_retrans(struct mptcp_sock *msk, 32 - struct mptcp_sched_data *data) 32 + static int mptcp_sched_default_get_retrans(struct mptcp_sock *msk) 33 33 { 34 34 struct sock *ssk; 35 35 ··· 155 157 int mptcp_sched_get_send(struct mptcp_sock *msk) 156 158 { 157 159 struct mptcp_subflow_context *subflow; 158 - struct mptcp_sched_data *data = NULL; 159 160 160 161 msk_owned_by_me(msk); 161 162 ··· 175 178 } 176 179 177 180 if (msk->sched == &mptcp_sched_default || !msk->sched) 178 - return mptcp_sched_default_get_send(msk, data); 179 - return msk->sched->get_send(msk, data); 181 + return mptcp_sched_default_get_send(msk); 182 + return msk->sched->get_send(msk); 180 183 } 181 184 182 185 int mptcp_sched_get_retrans(struct mptcp_sock *msk) 183 186 { 184 187 struct mptcp_subflow_context *subflow; 185 - struct mptcp_sched_data *data = NULL; 186 188 187 189 msk_owned_by_me(msk); 188 190 ··· 195 199 } 196 200 197 201 if (msk->sched == &mptcp_sched_default || !msk->sched) 198 - return mptcp_sched_default_get_retrans(msk, data); 202 + return mptcp_sched_default_get_retrans(msk); 199 203 if (msk->sched->get_retrans) 200 - return msk->sched->get_retrans(msk, data); 201 - return msk->sched->get_send(msk, data); 204 + return msk->sched->get_retrans(msk); 205 + return msk->sched->get_send(msk); 202 206 }