[PATCH net-next 07/22] net: sched: act_gact: get rid of tcf_gact_walker and tcf_gact_search

[Zhengchao Shao]

Use __tcf_generic_walker() and __tcf_idr_search() helpers by saving
gact_net_id when registering act_gact_ops. And then remove the walk
and lookup hook functions in act_gact.

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

diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
index ac29d1065232..80c276d2793d 100644
--- a/net/sched/act_gact.c
+++ b/net/sched/act_gact.c
@@ -222,23 +222,6 @@ static int tcf_gact_dump(struct sk_buff *skb, struct tc_action *a,
 	return -1;
 }
 
-static int tcf_gact_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, gact_net_id);
-
-	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
-}
-
-static int tcf_gact_search(struct net *net, struct tc_action **a, u32 index)
-{
-	struct tc_action_net *tn = net_generic(net, gact_net_id);
-
-	return tcf_idr_search(tn, a, index);
-}
-
 static size_t tcf_gact_get_fill_size(const struct tc_action *act)
 {
 	size_t sz = nla_total_size(sizeof(struct tc_gact)); /* TCA_GACT_PARMS */
@@ -303,13 +286,12 @@ static int tcf_gact_offload_act_setup(struct tc_action *act, void *entry_data,
 static struct tc_action_ops act_gact_ops = {
 	.kind		=	"gact",
 	.id		=	TCA_ID_GACT,
+	.net_id		=	&gact_net_id,
 	.owner		=	THIS_MODULE,
 	.act		=	tcf_gact_act,
 	.stats_update	=	tcf_gact_stats_update,
 	.dump		=	tcf_gact_dump,
 	.init		=	tcf_gact_init,
-	.walk		=	tcf_gact_walker,
-	.lookup		=	tcf_gact_search,
 	.get_fill_size	=	tcf_gact_get_fill_size,
 	.offload_act_setup =	tcf_gact_offload_act_setup,
 	.size		=	sizeof(struct tcf_gact),
-- 
2.17.1