From: Geliang Tang <tanggeliang@kylinos.cn>
bpf_mptcp_struct_ops_kfunc_set has been added, no need to add a new one.
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
net/mptcp/bpf.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c
index 8ce3a48c27e5..2583a6af6628 100644
--- a/net/mptcp/bpf.c
+++ b/net/mptcp/bpf.c
@@ -743,14 +743,6 @@ BTF_ID_FLAGS(func, __mptcp_subflow_connect, KF_SLEEPABLE)
BTF_ID_FLAGS(func, mptcp_subflow_shutdown, KF_SLEEPABLE)
BTF_ID_FLAGS(func, mptcp_close_ssk, KF_SLEEPABLE)
BTF_ID_FLAGS(func, mptcp_pm_nl_mp_prio_send_ack, KF_SLEEPABLE)
-BTF_KFUNCS_END(bpf_mptcp_struct_ops_kfunc_ids)
-
-static const struct btf_kfunc_id_set bpf_mptcp_struct_ops_kfunc_set = {
- .owner = THIS_MODULE,
- .set = &bpf_mptcp_struct_ops_kfunc_ids,
-};
-
-BTF_KFUNCS_START(bpf_mptcp_sched_kfunc_ids)
BTF_ID_FLAGS(func, mptcp_subflow_set_scheduled)
BTF_ID_FLAGS(func, bpf_mptcp_subflow_ctx_by_pos)
BTF_ID_FLAGS(func, mptcp_subflow_active)
@@ -759,11 +751,11 @@ BTF_ID_FLAGS(func, mptcp_wnd_end)
BTF_ID_FLAGS(func, tcp_stream_memory_free)
BTF_ID_FLAGS(func, bpf_mptcp_subflow_queues_empty)
BTF_ID_FLAGS(func, mptcp_pm_subflow_chk_stale)
-BTF_KFUNCS_END(bpf_mptcp_sched_kfunc_ids)
+BTF_KFUNCS_END(bpf_mptcp_struct_ops_kfunc_ids)
-static const struct btf_kfunc_id_set bpf_mptcp_sched_kfunc_set = {
+static const struct btf_kfunc_id_set bpf_mptcp_struct_ops_kfunc_set = {
.owner = THIS_MODULE,
- .set = &bpf_mptcp_sched_kfunc_ids,
+ .set = &bpf_mptcp_struct_ops_kfunc_ids,
};
static int __init bpf_mptcp_kfunc_init(void)
@@ -775,8 +767,6 @@ static int __init bpf_mptcp_kfunc_init(void)
&bpf_mptcp_common_kfunc_set);
ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_STRUCT_OPS,
&bpf_mptcp_struct_ops_kfunc_set);
- ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_STRUCT_OPS,
- &bpf_mptcp_sched_kfunc_set);
#ifdef CONFIG_BPF_JIT
ret = ret ?: register_bpf_struct_ops(&bpf_mptcp_pm_ops, mptcp_pm_ops);
ret = ret ?: register_bpf_struct_ops(&bpf_mptcp_sched_ops, mptcp_sched_ops);
--
2.45.2