Use __tcf_generic_walker() and __tcf_idr_search() helpers by saving
gate_net_id when registering act_gate_ops. And then remove the walk
and lookup hook functions in act_gate.
Signed-off-by: Zhengchao Shao <shaozhengchao@xxxxxxxxxx>
---
net/sched/act_gate.c | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/net/sched/act_gate.c b/net/sched/act_gate.c
index fd5155274733..e347e3b42a14 100644
--- a/net/sched/act_gate.c
+++ b/net/sched/act_gate.c
@@ -565,15 +565,6 @@ static int tcf_gate_dump(struct sk_buff *skb, struct tc_action *a,
return -1;
}
-static int tcf_gate_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, gate_net_id);
-
- return tcf_generic_walker(tn, skb, cb, type, ops, extack);
-}
static void tcf_gate_stats_update(struct tc_action *a, u64 bytes, u64 packets,
u64 drops, u64 lastuse, bool hw)
@@ -585,13 +576,6 @@ static void tcf_gate_stats_update(struct tc_action *a, u64 bytes, u64 packets,
tm->lastuse = max_t(u64, tm->lastuse, lastuse);
}
-static int tcf_gate_search(struct net *net, struct tc_action **a, u32 index)
-{
- struct tc_action_net *tn = net_generic(net, gate_net_id);
-
- return tcf_idr_search(tn, a, index);
-}
-
static size_t tcf_gate_get_fill_size(const struct tc_action *act)
{
return nla_total_size(sizeof(struct tc_gate));
@@ -649,15 +633,14 @@ static int tcf_gate_offload_act_setup(struct tc_action *act, void *entry_data,
static struct tc_action_ops act_gate_ops = {
.kind = "gate",
.id = TCA_ID_GATE,
+ .net_id = &gate_net_id,
.owner = THIS_MODULE,
.act = tcf_gate_act,
.dump = tcf_gate_dump,
.init = tcf_gate_init,
.cleanup = tcf_gate_cleanup,
- .walk = tcf_gate_walker,
.stats_update = tcf_gate_stats_update,
.get_fill_size = tcf_gate_get_fill_size,
- .lookup = tcf_gate_search,
.offload_act_setup = tcf_gate_offload_act_setup,
.size = sizeof(struct tcf_gate),
};
--
2.17.1
