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

Commit 589dad6d authored by Alexander Aring's avatar Alexander Aring Committed by David S. Miller
Browse files

net: sched: act: add extack to init callback 



This patch adds extack support for act init callback api. This
prepares to handle extack support inside each specific act
implementation.

Based on work by David Ahern <dsahern@gmail.com>

Cc: David Ahern <dsahern@gmail.com>
Signed-off-by: default avatarAlexander Aring <aring@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 84ae017a

include/net/act_api.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ struct tc_action_ops { 
	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);

			int bind, struct netlink_ext_ack *extack);

	int     (*walk)(struct net *, struct sk_buff *,

			struct netlink_callback *, int,

			const struct tc_action_ops *);

net/sched/act_api.c

+3 −2
Original line number Diff line number Diff line
@@ -680,9 +680,10 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp, 


	/* backward compatibility for policer */

	if (name == NULL)

		err = a_o->init(net, tb[TCA_ACT_OPTIONS], est, &a, ovr, bind);

		err = a_o->init(net, tb[TCA_ACT_OPTIONS], est, &a, ovr, bind,

				extack);

	else

		err = a_o->init(net, nla, est, &a, ovr, bind);

		err = a_o->init(net, nla, est, &a, ovr, bind, extack);

	if (err < 0)

		goto err_mod;

net/sched/act_bpf.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static void tcf_bpf_prog_fill_cfg(const struct tcf_bpf *prog, 


static int tcf_bpf_init(struct net *net, struct nlattr *nla,

			struct nlattr *est, struct tc_action **act,

			int replace, int bind)

			int replace, int bind, struct netlink_ext_ack *extack)

{

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

	struct nlattr *tb[TCA_ACT_BPF_MAX + 1];

net/sched/act_connmark.c

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ static const struct nla_policy connmark_policy[TCA_CONNMARK_MAX + 1] = { 


static int tcf_connmark_init(struct net *net, struct nlattr *nla,

			     struct nlattr *est, struct tc_action **a,

			     int ovr, int bind)

			     int ovr, int bind,

			     struct netlink_ext_ack *extack)

{

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

	struct nlattr *tb[TCA_CONNMARK_MAX + 1];

net/sched/act_csum.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static struct tc_action_ops act_csum_ops; 


static int tcf_csum_init(struct net *net, struct nlattr *nla,

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

			 int bind)

			 int bind, struct netlink_ext_ack *extack)

{

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

	struct tcf_csum_params *params_old, *params_new;