net: sched: act_tunnel_key: get rid of tunnel_key_walker and tunnel_key_search
tunnel_key_walker() and tunnel_key_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>
This commit is contained in:
parent
8a35c5df28
commit
f6ffa368f0
@ -769,23 +769,6 @@ nla_put_failure:
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int tunnel_key_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_tunnel_key_ops.net_id);
|
|
||||||
|
|
||||||
return tcf_generic_walker(tn, skb, cb, type, ops, extack);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int tunnel_key_search(struct net *net, struct tc_action **a, u32 index)
|
|
||||||
{
|
|
||||||
struct tc_action_net *tn = net_generic(net, act_tunnel_key_ops.net_id);
|
|
||||||
|
|
||||||
return tcf_idr_search(tn, a, index);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void tcf_tunnel_encap_put_tunnel(void *priv)
|
static void tcf_tunnel_encap_put_tunnel(void *priv)
|
||||||
{
|
{
|
||||||
struct ip_tunnel_info *tunnel = priv;
|
struct ip_tunnel_info *tunnel = priv;
|
||||||
@ -849,8 +832,6 @@ static struct tc_action_ops act_tunnel_key_ops = {
|
|||||||
.dump = tunnel_key_dump,
|
.dump = tunnel_key_dump,
|
||||||
.init = tunnel_key_init,
|
.init = tunnel_key_init,
|
||||||
.cleanup = tunnel_key_release,
|
.cleanup = tunnel_key_release,
|
||||||
.walk = tunnel_key_walker,
|
|
||||||
.lookup = tunnel_key_search,
|
|
||||||
.offload_act_setup = tcf_tunnel_key_offload_act_setup,
|
.offload_act_setup = tcf_tunnel_key_offload_act_setup,
|
||||||
.size = sizeof(struct tcf_tunnel_key),
|
.size = sizeof(struct tcf_tunnel_key),
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user