Use __tcf_generic_walker() and __tcf_idr_search() helpers by saving skbmod_net_id when registering act_skbmod_ops. And then remove the walk and lookup hook functions in act_skbmod. Signed-off-by: Zhengchao Shao <shaozhengchao@xxxxxxxxxx> --- net/sched/act_skbmod.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/net/sched/act_skbmod.c b/net/sched/act_skbmod.c index 2083612d8780..ae52e5f175ed 100644 --- a/net/sched/act_skbmod.c +++ b/net/sched/act_skbmod.c @@ -276,33 +276,15 @@ static int tcf_skbmod_dump(struct sk_buff *skb, struct tc_action *a, return -1; } -static int tcf_skbmod_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, skbmod_net_id); - - return tcf_generic_walker(tn, skb, cb, type, ops, extack); -} - -static int tcf_skbmod_search(struct net *net, struct tc_action **a, u32 index) -{ - struct tc_action_net *tn = net_generic(net, skbmod_net_id); - - return tcf_idr_search(tn, a, index); -} - static struct tc_action_ops act_skbmod_ops = { .kind = "skbmod", .id = TCA_ACT_SKBMOD, + .net_id = &skbmod_net_id, .owner = THIS_MODULE, .act = tcf_skbmod_act, .dump = tcf_skbmod_dump, .init = tcf_skbmod_init, .cleanup = tcf_skbmod_cleanup, - .walk = tcf_skbmod_walker, - .lookup = tcf_skbmod_search, .size = sizeof(struct tcf_skbmod), }; -- 2.17.1