Skip to content

Commit e846778

Browse files
matttbeintel-lab-lkp
authored andcommitted
Squash to "mptcp: add sched_data helpers"
"mptcp: add sched_data helpers" can be removed when "use bpf_iter in bpf schedulers" series will be applied. Same for the mptcp_sched_data structure. Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>
1 parent ef98ffd commit e846778

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

net/mptcp/sched.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static void mptcp_sched_data_set_contexts(const struct mptcp_sock *msk,
177177
int mptcp_sched_get_send(struct mptcp_sock *msk)
178178
{
179179
struct mptcp_subflow_context *subflow;
180-
struct mptcp_sched_data *data = NULL;
180+
struct mptcp_sched_data data;
181181

182182
msk_owned_by_me(msk);
183183

@@ -198,15 +198,15 @@ int mptcp_sched_get_send(struct mptcp_sock *msk)
198198
}
199199

200200
if (msk->sched == &mptcp_sched_default || !msk->sched)
201-
return mptcp_sched_default_get_send(msk, data);
202-
mptcp_sched_data_set_contexts(msk, data);
203-
return msk->sched->get_send(msk, data);
201+
return mptcp_sched_default_get_send(msk, &data);
202+
mptcp_sched_data_set_contexts(msk, &data);
203+
return msk->sched->get_send(msk, &data);
204204
}
205205

206206
int mptcp_sched_get_retrans(struct mptcp_sock *msk)
207207
{
208208
struct mptcp_subflow_context *subflow;
209-
struct mptcp_sched_data *data = NULL;
209+
struct mptcp_sched_data data;
210210

211211
msk_owned_by_me(msk);
212212

@@ -220,10 +220,10 @@ int mptcp_sched_get_retrans(struct mptcp_sock *msk)
220220
}
221221

222222
if (msk->sched == &mptcp_sched_default || !msk->sched)
223-
return mptcp_sched_default_get_retrans(msk, data);
223+
return mptcp_sched_default_get_retrans(msk, &data);
224224

225-
mptcp_sched_data_set_contexts(msk, data);
225+
mptcp_sched_data_set_contexts(msk, &data);
226226
if (msk->sched->get_retrans)
227-
return msk->sched->get_retrans(msk, data);
228-
return msk->sched->get_send(msk, data);
227+
return msk->sched->get_retrans(msk, &data);
228+
return msk->sched->get_send(msk, &data);
229229
}

0 commit comments

Comments
 (0)