[net-next,03/22] net: sched: act_connmark: get rid of tcf_connmark_walker and tcf_connmark_search

Commit Message

shaozhengchao Sept. 2, 2022, 11:24 a.m. UTC

Use __tcf_generic_walker() and __tcf_idr_search() helpers by saving
connmark_net_id when registering act_connmark_ops. And then remove
the walk and lookup hook functions in act_connmark.

Signed-off-by: Zhengchao Shao <[e-mail]>
---
 net/sched/act_connmark.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

Patch

diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c
index 09e2aafc8943..e7cc0aba9c4f 100644
--- a/net/sched/act_connmark.c
+++ b/net/sched/act_connmark.c
@@ -200,32 +200,14 @@  static inline int tcf_connmark_dump(struct sk_buff *skb, struct tc_action *a,
 	return -1;
 }
 
-static int tcf_connmark_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, connmark_net_id);
-
-	return tcf_generic_walker(tn, skb, cb, type, ops, extack);
-}
-
-static int tcf_connmark_search(struct net *net, struct tc_action **a, u32 index)
-{
-	struct tc_action_net *tn = net_generic(net, connmark_net_id);
-
-	return tcf_idr_search(tn, a, index);
-}
-
 static struct tc_action_ops act_connmark_ops = {
 	.kind		=	"connmark",
 	.id		=	TCA_ID_CONNMARK,
+	.net_id		=	&connmark_net_id,
 	.owner		=	THIS_MODULE,
 	.act		=	tcf_connmark_act,
 	.dump		=	tcf_connmark_dump,
 	.init		=	tcf_connmark_init,
-	.walk		=	tcf_connmark_walker,
-	.lookup		=	tcf_connmark_search,
 	.size		=	sizeof(struct tcf_connmark_info),
 };