Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f061b48c authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

Revert "net: sched: act: add extack for lookup callback" 



This reverts commit 331a9295 ("net: sched: act: add extack for lookup callback").

This extack is never used after 6 months... In fact, it can be just
set in the caller, right after ->lookup().

Cc: Alexander Aring <aring@mojatatu.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fd3c040b

include/net/act_api.h

+1 −2
Original line number Diff line number Diff line
@@ -85,8 +85,7 @@ struct tc_action_ops { 
		       struct tcf_result *); /* called under RCU BH lock*/

	int     (*dump)(struct sk_buff *, struct tc_action *, int, int);

	void	(*cleanup)(struct tc_action *);

	int     (*lookup)(struct net *net, struct tc_action **a, u32 index,

			  struct netlink_ext_ack *extack);

	int     (*lookup)(struct net *net, struct tc_action **a, u32 index);

	int     (*init)(struct net *net, struct nlattr *nla,

			struct nlattr *est, struct tc_action **act, int ovr,

			int bind, bool rtnl_held,

net/sched/act_api.c

+4 −2
Original line number Diff line number Diff line
@@ -1067,12 +1067,14 @@ static struct tc_action *tcf_action_get_1(struct net *net, struct nlattr *nla, 
	err = -EINVAL;

	ops = tc_lookup_action(tb[TCA_ACT_KIND]);

	if (!ops) { /* could happen in batch of actions */

		NL_SET_ERR_MSG(extack, "Specified TC action not found");

		NL_SET_ERR_MSG(extack, "Specified TC action kind not found");

		goto err_out;

	}

	err = -ENOENT;

	if (ops->lookup(net, &a, index, extack) == 0)

	if (ops->lookup(net, &a, index) == 0) {

		NL_SET_ERR_MSG(extack, "TC action with specified index not found");

		goto err_mod;

	}



	module_put(ops->owner);

	return a;

net/sched/act_bpf.c

+1 −2
Original line number Diff line number Diff line
@@ -387,8 +387,7 @@ static int tcf_bpf_walker(struct net *net, struct sk_buff *skb, 
	return tcf_generic_walker(tn, skb, cb, type, ops, extack);

}



static int tcf_bpf_search(struct net *net, struct tc_action **a, u32 index,

			  struct netlink_ext_ack *extack)

static int tcf_bpf_search(struct net *net, struct tc_action **a, u32 index)

{

	struct tc_action_net *tn = net_generic(net, bpf_net_id);

net/sched/act_connmark.c

+1 −2
Original line number Diff line number Diff line
@@ -190,8 +190,7 @@ static int tcf_connmark_walker(struct net *net, struct sk_buff *skb, 
	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 netlink_ext_ack *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);

net/sched/act_csum.c

+1 −2
Original line number Diff line number Diff line
@@ -646,8 +646,7 @@ static int tcf_csum_walker(struct net *net, struct sk_buff *skb, 
	return tcf_generic_walker(tn, skb, cb, type, ops, extack);

}



static int tcf_csum_search(struct net *net, struct tc_action **a, u32 index,

			   struct netlink_ext_ack *extack)

static int tcf_csum_search(struct net *net, struct tc_action **a, u32 index)

{

	struct tc_action_net *tn = net_generic(net, csum_net_id);