[Patch net-next 2/5] net_sched: move TCQ_F_MQROOT into qdisc ops
From: Cong Wang <hidden>
Date: 2015-08-26 22:41:35
Subsystem:
networking [general], tc subsystem, the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Jamal Hadi Salim, Jiri Pirko, Linus Torvalds
It is just another static flag which can be moved. Cc: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: Cong Wang <redacted> --- include/net/sch_generic.h | 2 +- net/sched/sch_api.c | 6 +++--- net/sched/sch_mq.c | 2 +- net/sched/sch_mqprio.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index fe835e1..943736a 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h@@ -50,7 +50,6 @@ struct Qdisc { unsigned int flags; #define TCQ_F_INGRESS 2 #define TCQ_F_CAN_BYPASS 4 -#define TCQ_F_MQROOT 8 #define TCQ_F_ONETXQUEUE 0x10 /* dequeue_skb() can assume all skbs are for * q->dev_queue : It can test * netif_xmit_frozen_or_stopped() before
@@ -181,6 +180,7 @@ struct Qdisc_ops { char id[IFNAMSIZ]; int priv_size; #define QDISC_F_BUILTIN 1 +#define QDISC_F_MQ 2 unsigned int flags; int (*enqueue)(struct sk_buff *, struct Qdisc *);
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index f2b194b..90a4cf9 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c@@ -970,12 +970,12 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, spinlock_t *root_lock; err = -EOPNOTSUPP; - if (sch->flags & TCQ_F_MQROOT) + if (sch->ops->flags & QDISC_F_MQ) goto err_out4; if ((sch->parent != TC_H_ROOT) && !(sch->flags & TCQ_F_INGRESS) && - (!p || !(p->flags & TCQ_F_MQROOT))) + (!p || !(p->ops->flags & QDISC_F_MQ))) root_lock = qdisc_root_sleeping_lock(sch); else root_lock = qdisc_lock(sch);
@@ -1041,7 +1041,7 @@ static int qdisc_change(struct Qdisc *sch, struct nlattr **tca) if (tca[TCA_RATE]) { /* NB: ignores errors from replace_estimator because change can't be undone. */ - if (sch->flags & TCQ_F_MQROOT) + if (sch->ops->flags & QDISC_F_MQ) goto out; gen_replace_estimator(&sch->bstats, sch->cpu_bstats,
diff --git a/net/sched/sch_mq.c b/net/sched/sch_mq.c
index f3cbaec..cab9fc2 100644
--- a/net/sched/sch_mq.c
+++ b/net/sched/sch_mq.c@@ -66,7 +66,6 @@ static int mq_init(struct Qdisc *sch, struct nlattr *opt) qdisc->flags |= TCQ_F_ONETXQUEUE; } - sch->flags |= TCQ_F_MQROOT; return 0; err:
@@ -237,6 +236,7 @@ static const struct Qdisc_class_ops mq_class_ops = { struct Qdisc_ops mq_qdisc_ops __read_mostly = { .cl_ops = &mq_class_ops, .id = "mq", + .flags = QDISC_F_MQ, .priv_size = sizeof(struct mq_sched), .init = mq_init, .destroy = mq_destroy,
diff --git a/net/sched/sch_mqprio.c b/net/sched/sch_mqprio.c
index 3811a74..dc208c2 100644
--- a/net/sched/sch_mqprio.c
+++ b/net/sched/sch_mqprio.c@@ -155,7 +155,6 @@ static int mqprio_init(struct Qdisc *sch, struct nlattr *opt) for (i = 0; i < TC_BITMASK + 1; i++) netdev_set_prio_tc_map(dev, i, qopt->prio_tc_map[i]); - sch->flags |= TCQ_F_MQROOT; return 0; err:
@@ -404,6 +403,7 @@ static const struct Qdisc_class_ops mqprio_class_ops = { static struct Qdisc_ops mqprio_qdisc_ops __read_mostly = { .cl_ops = &mqprio_class_ops, .id = "mqprio", + .flags = QDISC_F_MQ, .priv_size = sizeof(struct mqprio_sched), .init = mqprio_init, .destroy = mqprio_destroy,
--
1.8.3.1