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

Commit 68dfb427 authored by David S. Miller's avatar David S. Miller
Browse files

pkt_sched: Kill stats_lock member of struct Qdisc. 



It is always equal to qdisc->dev_queue->lock

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 816f3258

include/net/sch_generic.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,6 @@ struct Qdisc 
	struct gnet_stats_basic	bstats;

	struct gnet_stats_basic	bstats;

	struct gnet_stats_queue	qstats;

	struct gnet_stats_queue	qstats;

	struct gnet_stats_rate_est	rate_est;

	struct gnet_stats_rate_est	rate_est;

	spinlock_t		*stats_lock;

	struct rcu_head 	q_rcu;

	struct rcu_head 	q_rcu;

	int			(*reshape_fail)(struct sk_buff *skb,

	int			(*reshape_fail)(struct sk_buff *skb,

					struct Qdisc *q);

					struct Qdisc *q);

net/sched/sch_api.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -604,7 +604,6 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, 




	sch->parent = parent;

	sch->parent = parent;





	sch->stats_lock = &dev_queue->lock;

	if (handle == TC_H_INGRESS) {

	if (handle == TC_H_INGRESS) {

		sch->flags |= TCQ_F_INGRESS;

		sch->flags |= TCQ_F_INGRESS;

		handle = TC_H_MAKE(TC_H_INGRESS, 0);

		handle = TC_H_MAKE(TC_H_INGRESS, 0);
@@ -622,7 +621,7 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, 
	if (!ops->init || (err = ops->init(sch, tca[TCA_OPTIONS])) == 0) {

	if (!ops->init || (err = ops->init(sch, tca[TCA_OPTIONS])) == 0) {

		if (tca[TCA_RATE]) {

		if (tca[TCA_RATE]) {

			err = gen_new_estimator(&sch->bstats, &sch->rate_est,

			err = gen_new_estimator(&sch->bstats, &sch->rate_est,

						sch->stats_lock,

						&sch->dev_queue->lock,

						tca[TCA_RATE]);

						tca[TCA_RATE]);

			if (err) {

			if (err) {

				/*

				/*
@@ -664,7 +663,7 @@ static int qdisc_change(struct Qdisc *sch, struct nlattr **tca) 
	}

	}

	if (tca[TCA_RATE])

	if (tca[TCA_RATE])

		gen_replace_estimator(&sch->bstats, &sch->rate_est,

		gen_replace_estimator(&sch->bstats, &sch->rate_est,

			sch->stats_lock, tca[TCA_RATE]);

				      &sch->dev_queue->lock, tca[TCA_RATE]);

	return 0;

	return 0;

}

}
@@ -954,7 +953,7 @@ static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid, 
	q->qstats.qlen = q->q.qlen;

	q->qstats.qlen = q->q.qlen;





	if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS,

	if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS,

			TCA_XSTATS, q->stats_lock, &d) < 0)

					 TCA_XSTATS, &q->dev_queue->lock, &d) < 0)

		goto nla_put_failure;

		goto nla_put_failure;





	if (q->ops->dump_stats && q->ops->dump_stats(q, &d) < 0)

	if (q->ops->dump_stats && q->ops->dump_stats(q, &d) < 0)
@@ -1203,7 +1202,7 @@ static int tc_fill_tclass(struct sk_buff *skb, struct Qdisc *q, 
		goto nla_put_failure;

		goto nla_put_failure;





	if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS,

	if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS,

			TCA_XSTATS, q->stats_lock, &d) < 0)

					 TCA_XSTATS, &q->dev_queue->lock, &d) < 0)

		goto nla_put_failure;

		goto nla_put_failure;





	if (cl_ops->dump_stats && cl_ops->dump_stats(q, cl, &d) < 0)

	if (cl_ops->dump_stats && cl_ops->dump_stats(q, cl, &d) < 0)

net/sched/sch_generic.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -484,7 +484,6 @@ struct Qdisc * qdisc_create_dflt(struct net_device *dev, 
	sch = qdisc_alloc(dev_queue, ops);

	sch = qdisc_alloc(dev_queue, ops);

	if (IS_ERR(sch))

	if (IS_ERR(sch))

		goto errout;

		goto errout;

	sch->stats_lock = &dev_queue->lock;

	sch->parent = parentid;

	sch->parent = parentid;





	if (!ops->init || ops->init(sch, NULL) == 0)

	if (!ops->init || ops->init(sch, NULL) == 0)