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

net: sched: sch: add extack for init callback 



This patch adds extack support for init callback 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 09215598

include/net/sch_generic.h

+2 −1
Original line number Diff line number Diff line
@@ -189,7 +189,8 @@ struct Qdisc_ops { 
	struct sk_buff *	(*dequeue)(struct Qdisc *);

	struct sk_buff *	(*peek)(struct Qdisc *);



	int			(*init)(struct Qdisc *sch, struct nlattr *arg);

	int			(*init)(struct Qdisc *sch, struct nlattr *arg,

					struct netlink_ext_ack *extack);

	void			(*reset)(struct Qdisc *);

	void			(*destroy)(struct Qdisc *);

	int			(*change)(struct Qdisc *sch,

net/sched/sch_api.c

+1 −1
Original line number Diff line number Diff line
@@ -1084,7 +1084,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev, 
	}



	if (ops->init) {

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

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

		if (err != 0)

			goto err_out5;

	}

net/sched/sch_atm.c

+2 −1
Original line number Diff line number Diff line
@@ -531,7 +531,8 @@ static struct sk_buff *atm_tc_peek(struct Qdisc *sch) 
	return p->link.q->ops->peek(p->link.q);

}



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

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

		       struct netlink_ext_ack *extack)

{

	struct atm_qdisc_data *p = qdisc_priv(sch);

	int err;

net/sched/sch_cbq.c

+2 −1
Original line number Diff line number Diff line
@@ -1132,7 +1132,8 @@ static const struct nla_policy cbq_policy[TCA_CBQ_MAX + 1] = { 
	[TCA_CBQ_POLICE]	= { .len = sizeof(struct tc_cbq_police) },

};



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

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

		    struct netlink_ext_ack *extack)

{

	struct cbq_sched_data *q = qdisc_priv(sch);

	struct nlattr *tb[TCA_CBQ_MAX + 1];

net/sched/sch_cbs.c

+2 −1
Original line number Diff line number Diff line
@@ -291,7 +291,8 @@ static int cbs_change(struct Qdisc *sch, struct nlattr *opt) 
	return 0;

}



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

static int cbs_init(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);