Messages in this thread Patch in this message | | | From | Zhengchao Shao <> | Subject | [PATCH net-next 02/22] net: sched: act_bpf: get rid of tcf_bpf_walker and tcf_bpf_search | Date | Fri, 2 Sep 2022 19:24:26 +0800 |
| |
Use __tcf_generic_walker() and __tcf_idr_search() helpers by saving bpf_net_id when registering act_bpf_ops. And then remove the walk and lookup hook functions in act_bpf.
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com> --- net/sched/act_bpf.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c index fea2d78b9ddc..d7fc5c4157d6 100644 --- a/net/sched/act_bpf.c +++ b/net/sched/act_bpf.c @@ -390,33 +390,15 @@ static void tcf_bpf_cleanup(struct tc_action *act) tcf_bpf_cfg_cleanup(&tmp); } -static int tcf_bpf_walker(struct net *net, struct sk_buff *skb, - struct netlink_callback *cb, int type, - const struct tc_action_ops *ops, - struct netlink_ext_ack *extack) -{ - struct tc_action_net *tn = net_generic(net, bpf_net_id); - - return tcf_generic_walker(tn, skb, cb, type, ops, extack); -} - -static int tcf_bpf_search(struct net *net, struct tc_action **a, u32 index) -{ - struct tc_action_net *tn = net_generic(net, bpf_net_id); - - return tcf_idr_search(tn, a, index); -} - static struct tc_action_ops act_bpf_ops __read_mostly = { .kind = "bpf", .id = TCA_ID_BPF, + .net_id = &bpf_net_id, .owner = THIS_MODULE, .act = tcf_bpf_act, .dump = tcf_bpf_dump, .cleanup = tcf_bpf_cleanup, .init = tcf_bpf_init, - .walk = tcf_bpf_walker, - .lookup = tcf_bpf_search, .size = sizeof(struct tcf_bpf), }; -- 2.17.1
| |