* Re: [PATCH net-next 2/2] qdisc: fix build with !CONFIG_NET_SCHED
[not found] <20130831100442.60c99dc8@nehalam.linuxnetplumber.net>
@ 2013-08-31 17:15 ` Stephen Hemminger
2013-08-31 22:10 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Hemminger @ 2013-08-31 17:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev
Multiqueue scheduler refers to default_qdisc_ops; therefore the
variable definition needs to be moved to handle case where net
scheduler API is not available.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
--- a/net/sched/sch_api.c 2013-08-31 09:40:20.949205839 -0700
+++ b/net/sched/sch_api.c 2013-08-31 10:01:45.811672724 -0700
@@ -131,11 +131,6 @@ static DEFINE_RWLOCK(qdisc_mod_lock);
************************************************/
-/* Qdisc to use by default */
-
-const struct Qdisc_ops *default_qdisc_ops = &pfifo_fast_ops;
-EXPORT_SYMBOL(default_qdisc_ops);
-
/* The list of all installed queueing disciplines. */
static struct Qdisc_ops *qdisc_base;
--- a/net/sched/sch_generic.c 2013-08-31 09:50:18.313178455 -0700
+++ b/net/sched/sch_generic.c 2013-08-31 10:02:10.699323182 -0700
@@ -30,6 +30,10 @@
#include <net/pkt_sched.h>
#include <net/dst.h>
+/* Qdisc to use by default */
+const struct Qdisc_ops *default_qdisc_ops = &pfifo_fast_ops;
+EXPORT_SYMBOL(default_qdisc_ops);
+
/* Main transmission queue. */
/* Modifications to data participating in scheduling must be protected with
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-31 22:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20130831100442.60c99dc8@nehalam.linuxnetplumber.net>
2013-08-31 17:15 ` [PATCH net-next 2/2] qdisc: fix build with !CONFIG_NET_SCHED Stephen Hemminger
2013-08-31 22:10 ` David Miller
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).