summaryrefslogtreecommitdiff
path: root/net/sched/sch_generic.c
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2015-08-27 22:21:38 +0300
committerDavid S. Miller <davem@davemloft.net>2015-08-28 03:14:30 +0300
commitd66d6c3152e8d5a6db42a56bf7ae1c6cae87ba48 (patch)
tree15e538fa64d6f8dcb0c69dff2a1daffc74c59d7a /net/sched/sch_generic.c
parentdb4094bca7a5746bc8e36db0557e8732963e88f0 (diff)
downloadlinux-d66d6c3152e8d5a6db42a56bf7ae1c6cae87ba48.tar.xz
net: sched: register noqueue qdisc
This way users can attach noqueue just like any other qdisc using tc without having to mess with tx_queue_len first. Signed-off-by: Phil Sutter <phil@nwl.cc> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_generic.c')
-rw-r--r--net/sched/sch_generic.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index f501b7409320..d5c7c0d88786 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -416,9 +416,19 @@ struct Qdisc noop_qdisc = {
};
EXPORT_SYMBOL(noop_qdisc);
-static struct Qdisc_ops noqueue_qdisc_ops __read_mostly = {
+static int noqueue_init(struct Qdisc *qdisc, struct nlattr *opt)
+{
+ /* register_qdisc() assigns a default of noop_enqueue if unset,
+ * but __dev_queue_xmit() treats noqueue only as such
+ * if this is NULL - so clear it here. */
+ qdisc->enqueue = NULL;
+ return 0;
+}
+
+struct Qdisc_ops noqueue_qdisc_ops __read_mostly = {
.id = "noqueue",
.priv_size = 0,
+ .init = noqueue_init,
.enqueue = noop_enqueue,
.dequeue = noop_dequeue,
.peek = noop_dequeue,