[PATCH net-next 16/22] net: sched: act_sample: get rid of tcf_sample_walker and tcf_sample_search

[Zhengchao Shao]

Use __tcf_generic_walker() and __tcf_idr_search() helpers by saving
sample_net_id when registering act_sample_ops. And then remove the
walk and lookup hook functions in act_sample.

Signed-off-by: Zhengchao Shao <shaozhengchao@xxxxxxxxxx>
---
 net/sched/act_sample.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/net/sched/act_sample.c b/net/sched/act_sample.c
index 2f7f5e44d28c..f545f38acbdc 100644
--- a/net/sched/act_sample.c
+++ b/net/sched/act_sample.c
@@ -241,23 +241,6 @@ static int tcf_sample_dump(struct sk_buff *skb, struct tc_action *a,
 	return -1;
 }
 
-static int tcf_sample_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, sample_net_id);
-
-	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
-}
-
-static int tcf_sample_search(struct net *net, struct tc_action **a, u32 index)
-{
-	struct tc_action_net *tn = net_generic(net, sample_net_id);
-
-	return tcf_idr_search(tn, a, index);
-}
-
 static void tcf_psample_group_put(void *priv)
 {
 	struct psample_group *group = priv;
@@ -315,14 +298,13 @@ static int tcf_sample_offload_act_setup(struct tc_action *act, void *entry_data,
 static struct tc_action_ops act_sample_ops = {
 	.kind	  = "sample",
 	.id	  = TCA_ID_SAMPLE,
+	.net_id	  = &sample_net_id,
 	.owner	  = THIS_MODULE,
 	.act	  = tcf_sample_act,
 	.stats_update = tcf_sample_stats_update,
 	.dump	  = tcf_sample_dump,
 	.init	  = tcf_sample_init,
 	.cleanup  = tcf_sample_cleanup,
-	.walk	  = tcf_sample_walker,
-	.lookup	  = tcf_sample_search,
 	.get_psample_group = tcf_sample_get_group,
 	.offload_act_setup    = tcf_sample_offload_act_setup,
 	.size	  = sizeof(struct tcf_sample),
-- 
2.17.1