Use __tcf_generic_walker() and __tcf_idr_search() helpers by saving
simp_net_id when registering act_simp_ops. And then remove the walk
and lookup hook functions in act_simple.
Signed-off-by: Zhengchao Shao <shaozhengchao@xxxxxxxxxx>
---
net/sched/act_simple.c | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
index 8c1d60bde93e..0091e6cd707b 100644
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
@@ -198,33 +198,15 @@ static int tcf_simp_dump(struct sk_buff *skb, struct tc_action *a,
return -1;
}
-static int tcf_simp_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, simp_net_id);
-
- return tcf_generic_walker(tn, skb, cb, type, ops, extack);
-}
-
-static int tcf_simp_search(struct net *net, struct tc_action **a, u32 index)
-{
- struct tc_action_net *tn = net_generic(net, simp_net_id);
-
- return tcf_idr_search(tn, a, index);
-}
-
static struct tc_action_ops act_simp_ops = {
.kind = "simple",
.id = TCA_ID_SIMP,
+ .net_id = &simp_net_id,
.owner = THIS_MODULE,
.act = tcf_simp_act,
.dump = tcf_simp_dump,
.cleanup = tcf_simp_release,
.init = tcf_simp_init,
- .walk = tcf_simp_walker,
- .lookup = tcf_simp_search,
.size = sizeof(struct tcf_defact),
};
--
2.17.1
