[PATCH net-next 05/22] net: sched: act_ct: get rid of tcf_ct_walker and tcf_ct_search

[Zhengchao Shao]

Use __tcf_generic_walker() and __tcf_idr_search() helpers by saving
ct_net_id when registering act_ct_ops. And then remove the walk and
lookup hook functions in act_ct.

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

diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c
index d55afb8d14be..436517272c9d 100644
--- a/net/sched/act_ct.c
+++ b/net/sched/act_ct.c
@@ -1558,23 +1558,6 @@ static inline int tcf_ct_dump(struct sk_buff *skb, struct tc_action *a,
 	return -1;
 }
 
-static int tcf_ct_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, ct_net_id);
-
-	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
-}
-
-static int tcf_ct_search(struct net *net, struct tc_action **a, u32 index)
-{
-	struct tc_action_net *tn = net_generic(net, ct_net_id);
-
-	return tcf_idr_search(tn, a, index);
-}
-
 static void tcf_stats_update(struct tc_action *a, u64 bytes, u64 packets,
 			     u64 drops, u64 lastuse, bool hw)
 {
@@ -1608,13 +1591,12 @@ static int tcf_ct_offload_act_setup(struct tc_action *act, void *entry_data,
 static struct tc_action_ops act_ct_ops = {
 	.kind		=	"ct",
 	.id		=	TCA_ID_CT,
+	.net_id		=	&ct_net_id,
 	.owner		=	THIS_MODULE,
 	.act		=	tcf_ct_act,
 	.dump		=	tcf_ct_dump,
 	.init		=	tcf_ct_init,
 	.cleanup	=	tcf_ct_cleanup,
-	.walk		=	tcf_ct_walker,
-	.lookup		=	tcf_ct_search,
 	.stats_update	=	tcf_stats_update,
 	.offload_act_setup =	tcf_ct_offload_act_setup,
 	.size		=	sizeof(struct tcf_ct),
-- 
2.17.1