net: sched: act_ipt: get rid of tcf_ipt_walker/tcf_xt_walker and tcf_ipt_search/tcf_x...

tcf_ipt_walker()/tcf_xt_walker() and tcf_ipt_search()/tcf_xt_search() do
the same thing as generic walk/search function, so remove them.

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index 45bd550..1625e10 100644 (file)
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -313,23 +313,6 @@ nla_put_failure:
        return -1;
 }
 
-static int tcf_ipt_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, act_ipt_ops.net_id);
-
-       return tcf_generic_walker(tn, skb, cb, type, ops, extack);
-}
-
-static int tcf_ipt_search(struct net *net, struct tc_action **a, u32 index)
-{
-       struct tc_action_net *tn = net_generic(net, act_ipt_ops.net_id);
-
-       return tcf_idr_search(tn, a, index);
-}
-
 static struct tc_action_ops act_ipt_ops = {
        .kind           =       "ipt",
        .id             =       TCA_ID_IPT,
@@ -338,8 +321,6 @@ static struct tc_action_ops act_ipt_ops = {
        .dump           =       tcf_ipt_dump,
        .cleanup        =       tcf_ipt_release,
        .init           =       tcf_ipt_init,
-       .walk           =       tcf_ipt_walker,
-       .lookup         =       tcf_ipt_search,
        .size           =       sizeof(struct tcf_ipt),
 };
 
@@ -362,23 +343,6 @@ static struct pernet_operations ipt_net_ops = {
        .size = sizeof(struct tc_action_net),
 };
 
-static int tcf_xt_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, act_xt_ops.net_id);
-
-       return tcf_generic_walker(tn, skb, cb, type, ops, extack);
-}
-
-static int tcf_xt_search(struct net *net, struct tc_action **a, u32 index)
-{
-       struct tc_action_net *tn = net_generic(net, act_xt_ops.net_id);
-
-       return tcf_idr_search(tn, a, index);
-}
-
 static struct tc_action_ops act_xt_ops = {
        .kind           =       "xt",
        .id             =       TCA_ID_XT,
@@ -387,8 +351,6 @@ static struct tc_action_ops act_xt_ops = {
        .dump           =       tcf_ipt_dump,
        .cleanup        =       tcf_ipt_release,
        .init           =       tcf_xt_init,
-       .walk           =       tcf_xt_walker,
-       .lookup         =       tcf_xt_search,
        .size           =       sizeof(struct tcf_ipt),
 };