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

Commit 2030721c authored by Alexander Aring's avatar Alexander Aring Committed by David S. Miller
Browse files

net: sched: sch: add extack for change qdisc ops 



This patch adds extack support for change callback for qdisc ops
structtur to prepare per-qdisc specific changes for extack.

Cc: David Ahern <dsahern@gmail.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarAlexander Aring <aring@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e63d7dfd

include/net/sch_generic.h

+2 −1
Original line number Diff line number Diff line
@@ -194,7 +194,8 @@ struct Qdisc_ops { 
	void			(*reset)(struct Qdisc *);

	void			(*destroy)(struct Qdisc *);

	int			(*change)(struct Qdisc *sch,

					  struct nlattr *arg);

					  struct nlattr *arg,

					  struct netlink_ext_ack *extack);

	void			(*attach)(struct Qdisc *sch);



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

net/sched/sch_api.c

+1 −1
Original line number Diff line number Diff line
@@ -1177,7 +1177,7 @@ static int qdisc_change(struct Qdisc *sch, struct nlattr **tca, 
			NL_SET_ERR_MSG(extack, "Change operation not supported by specified qdisc");

			return -EINVAL;

		}

		err = sch->ops->change(sch, tca[TCA_OPTIONS]);

		err = sch->ops->change(sch, tca[TCA_OPTIONS], extack);

		if (err)

			return err;

	}

net/sched/sch_cbs.c

+3 −2
Original line number Diff line number Diff line
@@ -246,7 +246,8 @@ static int cbs_enable_offload(struct net_device *dev, struct cbs_sched_data *q, 
	return 0;

}



static int cbs_change(struct Qdisc *sch, struct nlattr *opt)

static int cbs_change(struct Qdisc *sch, struct nlattr *opt,

		      struct netlink_ext_ack *extack)

{

	struct cbs_sched_data *q = qdisc_priv(sch);

	struct net_device *dev = qdisc_dev(sch);
@@ -307,7 +308,7 @@ static int cbs_init(struct Qdisc *sch, struct nlattr *opt, 


	qdisc_watchdog_init(&q->watchdog, sch);



	return cbs_change(sch, opt);

	return cbs_change(sch, opt, extack);

}



static void cbs_destroy(struct Qdisc *sch)

net/sched/sch_choke.c

+3 −2
Original line number Diff line number Diff line
@@ -344,7 +344,8 @@ static void choke_free(void *addr) 
	kvfree(addr);

}



static int choke_change(struct Qdisc *sch, struct nlattr *opt)

static int choke_change(struct Qdisc *sch, struct nlattr *opt,

			struct netlink_ext_ack *extack)

{

	struct choke_sched_data *q = qdisc_priv(sch);

	struct nlattr *tb[TCA_CHOKE_MAX + 1];
@@ -434,7 +435,7 @@ static int choke_change(struct Qdisc *sch, struct nlattr *opt) 
static int choke_init(struct Qdisc *sch, struct nlattr *opt,

		      struct netlink_ext_ack *extack)

{

	return choke_change(sch, opt);

	return choke_change(sch, opt, extack);

}



static int choke_dump(struct Qdisc *sch, struct sk_buff *skb)

net/sched/sch_codel.c

+3 −2
Original line number Diff line number Diff line
@@ -130,7 +130,8 @@ static const struct nla_policy codel_policy[TCA_CODEL_MAX + 1] = { 
	[TCA_CODEL_CE_THRESHOLD]= { .type = NLA_U32 },

};



static int codel_change(struct Qdisc *sch, struct nlattr *opt)

static int codel_change(struct Qdisc *sch, struct nlattr *opt,

			struct netlink_ext_ack *extack)

{

	struct codel_sched_data *q = qdisc_priv(sch);

	struct nlattr *tb[TCA_CODEL_MAX + 1];
@@ -197,7 +198,7 @@ static int codel_init(struct Qdisc *sch, struct nlattr *opt, 
	q->params.mtu = psched_mtu(qdisc_dev(sch));



	if (opt) {

		int err = codel_change(sch, opt);

		int err = codel_change(sch, opt, extack);



		if (err)

			return err;