Currently bpf_kfunc_set_tcp_reqsk is registered for BPF_PROG_TYPE_SCHED_CLS. We will add more kfuncs there, but the name is too specific. Let's rename it to bpf_kfunc_set_sched_cls. Signed-off-by: Kuniyuki Iwashima --- net/core/filter.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index 9590877b0714..823c62481dbf 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -12498,9 +12498,9 @@ BTF_KFUNCS_START(bpf_kfunc_check_set_sock_addr) BTF_ID_FLAGS(func, bpf_sock_addr_set_sun_path) BTF_KFUNCS_END(bpf_kfunc_check_set_sock_addr) -BTF_KFUNCS_START(bpf_kfunc_check_set_tcp_reqsk) +BTF_KFUNCS_START(bpf_kfunc_check_set_sched_cls) BTF_ID_FLAGS(func, bpf_sk_assign_tcp_reqsk) -BTF_KFUNCS_END(bpf_kfunc_check_set_tcp_reqsk) +BTF_KFUNCS_END(bpf_kfunc_check_set_sched_cls) BTF_KFUNCS_START(bpf_kfunc_check_set_sock_ops) BTF_ID_FLAGS(func, bpf_sock_ops_enable_tx_tstamp) @@ -12526,9 +12526,9 @@ static const struct btf_kfunc_id_set bpf_kfunc_set_sock_addr = { .set = &bpf_kfunc_check_set_sock_addr, }; -static const struct btf_kfunc_id_set bpf_kfunc_set_tcp_reqsk = { +static const struct btf_kfunc_id_set bpf_kfunc_set_sched_cls = { .owner = THIS_MODULE, - .set = &bpf_kfunc_check_set_tcp_reqsk, + .set = &bpf_kfunc_check_set_sched_cls, }; static const struct btf_kfunc_id_set bpf_kfunc_set_sock_ops = { @@ -12556,7 +12556,7 @@ static int __init bpf_kfunc_init(void) ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_XDP, &bpf_kfunc_set_xdp); ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_CGROUP_SOCK_ADDR, &bpf_kfunc_set_sock_addr); - ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SCHED_CLS, &bpf_kfunc_set_tcp_reqsk); + ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SCHED_CLS, &bpf_kfunc_set_sched_cls); return ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SOCK_OPS, &bpf_kfunc_set_sock_ops); } late_initcall(bpf_kfunc_init); -- 2.54.0.1136.gdb2ca164c4-goog