From: Phil Sutter <phil@nwl.cc>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, eric.dumazet@gmail.com, brouer@redhat.com
Subject: [net-next PATCH v2 1/3] net: sched: make noqueue_qdisc non-static
Date: Sat, 22 Aug 2015 02:20:54 +0200 [thread overview]
Message-ID: <1440202856-1645-2-git-send-email-phil@nwl.cc> (raw)
In-Reply-To: <1440202856-1645-1-git-send-email-phil@nwl.cc>
This needs to be referenced from within net/sched/sched_api.c later.
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
include/net/sch_generic.h | 1 +
net/sched/sch_generic.c | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 2eab08c..4495193 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -337,6 +337,7 @@ static inline void sch_tree_unlock(const struct Qdisc *q)
#define tcf_tree_unlock(tp) sch_tree_unlock((tp)->q)
extern struct Qdisc noop_qdisc;
+extern struct Qdisc noqueue_qdisc;
extern struct Qdisc_ops noop_qdisc_ops;
extern struct Qdisc_ops pfifo_fast_ops;
extern struct Qdisc_ops mq_qdisc_ops;
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 942fea8..1fb65f9 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -425,13 +425,12 @@ static struct Qdisc_ops noqueue_qdisc_ops __read_mostly = {
.owner = THIS_MODULE,
};
-static struct Qdisc noqueue_qdisc;
static struct netdev_queue noqueue_netdev_queue = {
.qdisc = &noqueue_qdisc,
.qdisc_sleeping = &noqueue_qdisc,
};
-static struct Qdisc noqueue_qdisc = {
+struct Qdisc noqueue_qdisc = {
.enqueue = NULL,
.dequeue = noop_dequeue,
.flags = TCQ_F_BUILTIN,
--
2.1.2
next prev parent reply other threads:[~2015-08-22 0:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-22 0:20 [net-next PATCH v2 0/3] net: sched: allow switching qdisc to noqueue intuitively Phil Sutter
2015-08-22 0:20 ` Phil Sutter [this message]
2015-08-22 0:20 ` [net-next PATCH v2 2/3] net: sched: allocate a handle to default qdiscs Phil Sutter
2015-08-22 0:20 ` [net-next PATCH v2 3/3] net: sched: fall back to noqueue when removing root qdisc Phil Sutter
2015-08-23 18:44 ` Jesper Dangaard Brouer
2015-08-23 18:53 ` Jesper Dangaard Brouer
2015-08-26 9:48 ` Phil Sutter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440202856-1645-2-git-send-email-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=brouer@redhat.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).